diff options
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/amiga/config.c | 6 | ||||
-rw-r--r-- | arch/ppc/platforms/apus_setup.c | 14 |
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c index 55794d1d4ec3..60e2da1c92c0 100644 --- a/arch/ppc/amiga/config.c +++ b/arch/ppc/amiga/config.c | |||
@@ -90,9 +90,6 @@ static void a3000_gettod (int *, int *, int *, int *, int *, int *); | |||
90 | static void a2000_gettod (int *, int *, int *, int *, int *, int *); | 90 | static void a2000_gettod (int *, int *, int *, int *, int *, int *); |
91 | static int amiga_hwclk (int, struct hwclk_time *); | 91 | static int amiga_hwclk (int, struct hwclk_time *); |
92 | static int amiga_set_clock_mmss (unsigned long); | 92 | static int amiga_set_clock_mmss (unsigned long); |
93 | #ifdef CONFIG_AMIGA_FLOPPY | ||
94 | extern void amiga_floppy_setup(char *, int *); | ||
95 | #endif | ||
96 | static void amiga_reset (void); | 93 | static void amiga_reset (void); |
97 | extern void amiga_init_sound(void); | 94 | extern void amiga_init_sound(void); |
98 | static void amiga_savekmsg_init(void); | 95 | static void amiga_savekmsg_init(void); |
@@ -419,9 +416,6 @@ void __init config_amiga(void) | |||
419 | 416 | ||
420 | mach_hwclk = amiga_hwclk; | 417 | mach_hwclk = amiga_hwclk; |
421 | mach_set_clock_mmss = amiga_set_clock_mmss; | 418 | mach_set_clock_mmss = amiga_set_clock_mmss; |
422 | #ifdef CONFIG_AMIGA_FLOPPY | ||
423 | mach_floppy_setup = amiga_floppy_setup; | ||
424 | #endif | ||
425 | mach_reset = amiga_reset; | 419 | mach_reset = amiga_reset; |
426 | #ifdef CONFIG_HEARTBEAT | 420 | #ifdef CONFIG_HEARTBEAT |
427 | mach_heartbeat = amiga_heartbeat; | 421 | mach_heartbeat = amiga_heartbeat; |
diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c index f62179f14cbb..c42c50073da5 100644 --- a/arch/ppc/platforms/apus_setup.c +++ b/arch/ppc/platforms/apus_setup.c | |||
@@ -55,9 +55,6 @@ int (*mach_hwclk) (int, struct hwclk_time*) = NULL; | |||
55 | int (*mach_set_clock_mmss) (unsigned long) = NULL; | 55 | int (*mach_set_clock_mmss) (unsigned long) = NULL; |
56 | void (*mach_reset)( void ); | 56 | void (*mach_reset)( void ); |
57 | long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */ | 57 | long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */ |
58 | #if defined(CONFIG_AMIGA_FLOPPY) | ||
59 | void (*mach_floppy_setup) (char *, int *) __initdata = NULL; | ||
60 | #endif | ||
61 | #ifdef CONFIG_HEARTBEAT | 58 | #ifdef CONFIG_HEARTBEAT |
62 | void (*mach_heartbeat) (int) = NULL; | 59 | void (*mach_heartbeat) (int) = NULL; |
63 | extern void apus_heartbeat (void); | 60 | extern void apus_heartbeat (void); |
@@ -76,7 +73,6 @@ struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */ | |||
76 | 73 | ||
77 | struct mem_info ramdisk; | 74 | struct mem_info ramdisk; |
78 | 75 | ||
79 | extern void amiga_floppy_setup(char *, int *); | ||
80 | extern void config_amiga(void); | 76 | extern void config_amiga(void); |
81 | 77 | ||
82 | static int __60nsram = 0; | 78 | static int __60nsram = 0; |
@@ -305,16 +301,6 @@ void kbd_reset_setup(char *str, int *ints) | |||
305 | { | 301 | { |
306 | } | 302 | } |
307 | 303 | ||
308 | /*********************************************************** FLOPPY */ | ||
309 | #if defined(CONFIG_AMIGA_FLOPPY) | ||
310 | __init | ||
311 | void floppy_setup(char *str, int *ints) | ||
312 | { | ||
313 | if (mach_floppy_setup) | ||
314 | mach_floppy_setup (str, ints); | ||
315 | } | ||
316 | #endif | ||
317 | |||
318 | /*********************************************************** MEMORY */ | 304 | /*********************************************************** MEMORY */ |
319 | #define KMAP_MAX 32 | 305 | #define KMAP_MAX 32 |
320 | unsigned long kmap_chunks[KMAP_MAX*3]; | 306 | unsigned long kmap_chunks[KMAP_MAX*3]; |