diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:09:05 -0500 |
commit | 639074354bb371feb2dde409b2ce05d56afef02b (patch) | |
tree | 2524111d2bc4531e3cbd280f1b02d656b41c41d4 /arch/m68k/kernel | |
parent | 0c79358b874af31430cf8d26540ae7b8713505f6 (diff) |
[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/setup.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 583526fa59c7..750d5b3c971f 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c | |||
@@ -84,9 +84,6 @@ void (*mach_reset)( void ); | |||
84 | void (*mach_halt)( void ); | 84 | void (*mach_halt)( void ); |
85 | void (*mach_power_off)( void ); | 85 | void (*mach_power_off)( void ); |
86 | long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */ | 86 | long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */ |
87 | #if defined(CONFIG_AMIGA_FLOPPY) || defined(CONFIG_ATARI_FLOPPY) | ||
88 | void (*mach_floppy_setup) (char *, int *) __initdata = NULL; | ||
89 | #endif | ||
90 | #ifdef CONFIG_HEARTBEAT | 87 | #ifdef CONFIG_HEARTBEAT |
91 | void (*mach_heartbeat) (int); | 88 | void (*mach_heartbeat) (int); |
92 | EXPORT_SYMBOL(mach_heartbeat); | 89 | EXPORT_SYMBOL(mach_heartbeat); |
@@ -527,16 +524,6 @@ int get_hardware_list(char *buffer) | |||
527 | return(len); | 524 | return(len); |
528 | } | 525 | } |
529 | 526 | ||
530 | |||
531 | #if defined(CONFIG_AMIGA_FLOPPY) || defined(CONFIG_ATARI_FLOPPY) | ||
532 | void __init floppy_setup(char *str, int *ints) | ||
533 | { | ||
534 | if (mach_floppy_setup) | ||
535 | mach_floppy_setup (str, ints); | ||
536 | } | ||
537 | |||
538 | #endif | ||
539 | |||
540 | void check_bugs(void) | 527 | void check_bugs(void) |
541 | { | 528 | { |
542 | #ifndef CONFIG_M68KFPU_EMU | 529 | #ifndef CONFIG_M68KFPU_EMU |