patch-2.3.16 linux/arch/m68k/kernel/setup.c
Next file: linux/arch/m68k/mac/adb-bus.c
Previous file: linux/arch/m68k/kernel/bios32.c
Back to the patch index
Back to the overall index
- Lines: 38
- Date:
Thu Aug 26 12:42:31 1999
- Orig file:
v2.3.15/linux/arch/m68k/kernel/setup.c
- Orig date:
Fri Jul 23 12:20:23 1999
diff -u --recursive --new-file v2.3.15/linux/arch/m68k/kernel/setup.c linux/arch/m68k/kernel/setup.c
@@ -130,7 +130,7 @@
#define MASK_256K 0xfffc0000
-__initfunc(static void m68k_parse_bootinfo(const struct bi_record *record))
+static void __init m68k_parse_bootinfo(const struct bi_record *record)
{
while (record->tag != BI_LAST) {
int unknown = 0;
@@ -190,8 +190,8 @@
#endif
}
-__initfunc(void setup_arch(char **cmdline_p, unsigned long * memory_start_p,
- unsigned long * memory_end_p))
+void __init setup_arch(char **cmdline_p, unsigned long * memory_start_p,
+ unsigned long * memory_end_p)
{
extern int _etext, _edata, _end;
int i;
@@ -467,7 +467,7 @@
#endif
#if defined(CONFIG_AMIGA_FLOPPY) || defined(CONFIG_ATARI_FLOPPY) || defined(CONFIG_BLK_DEV_FD)
-__initfunc(void floppy_setup(char *str, int *ints))
+void __init floppy_setup(char *str, int *ints)
{
if (mach_floppy_setup)
mach_floppy_setup (str, ints);
@@ -481,7 +481,7 @@
#endif
/* for "kbd-reset" cmdline param */
-__initfunc(void kbd_reset_setup(char *str, int *ints))
+void __init kbd_reset_setup(char *str, int *ints)
{
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)