summaryrefslogtreecommitdiff
path: root/include/asm-m68k/atari_stram.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-11 11:22:04 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-11 11:22:04 +0300
commit95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch)
treeaa2aac22a5b329b778a6771a87bbf1945ad49bbd /include/asm-m68k/atari_stram.h
parentd278c48435625cb6b7edcf6a547620768b175709 (diff)
parent8e4921515c1a379539607eb443d51c30f4f7f338 (diff)
downloadlinux-95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c.tar.xz
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts: arch/x86/kernel/setup_percpu.c arch/x86/mm/fault.c drivers/acpi/processor_idle.c kernel/irq/handle.c
Diffstat (limited to 'include/asm-m68k/atari_stram.h')
-rw-r--r--include/asm-m68k/atari_stram.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/include/asm-m68k/atari_stram.h b/include/asm-m68k/atari_stram.h
deleted file mode 100644
index 7546d13963be..000000000000
--- a/include/asm-m68k/atari_stram.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _M68K_ATARI_STRAM_H
-#define _M68K_ATARI_STRAM_H
-
-/*
- * Functions for Atari ST-RAM management
- */
-
-/* public interface */
-void *atari_stram_alloc(long size, const char *owner);
-void atari_stram_free(void *);
-
-/* functions called internally by other parts of the kernel */
-void atari_stram_init(void);
-void atari_stram_reserve_pages(void *start_mem);
-void atari_stram_mem_init_hook (void);
-
-#endif /*_M68K_ATARI_STRAM_H */