diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/m68k/mvme16x | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/m68k/mvme16x')
| -rw-r--r-- | arch/m68k/mvme16x/config.c | 3 | ||||
| -rw-r--r-- | arch/m68k/mvme16x/rtc.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index db7eb3137..2f5d5689a 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -15,7 +15,6 @@ */ #include <linux/config.h> -#include <stdarg.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/mm.h> @@ -132,7 +131,7 @@ static int mvme16x_get_hardware_list(char *buffer) #define PccSCCTICR 0x1e #define PccSCCRICR 0x1f -__initfunc(void config_mvme16x(void)) +void __init config_mvme16x(void) { p_bdid p = (p_bdid)mvme_bdid_ptr; char id[40]; diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index b9485e54d..75efb8bd6 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c @@ -155,7 +155,7 @@ static struct miscdevice rtc_dev= &rtc_fops }; -__initfunc(int rtc_MK48T08_init(void)) +int __init rtc_MK48T08_init(void) { if (!MACH_IS_MVME16x) return -ENODEV; |