diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/char/amikeyb.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/char/amikeyb.c')
| -rw-r--r-- | drivers/char/amikeyb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/amikeyb.c b/drivers/char/amikeyb.c index 8c8c58388..d9ebd1084 100644 --- a/drivers/char/amikeyb.c +++ b/drivers/char/amikeyb.c @@ -295,7 +295,7 @@ static void keyboard_interrupt(int irq, void *dummy, struct pt_regs *fp) } } -__initfunc(int amiga_keyb_init(void)) +int __init amiga_keyb_init(void) { if (!AMIGAHW_PRESENT(AMI_KEYBOARD)) return -EIO; @@ -343,6 +343,6 @@ int amiga_kbdrate( struct kbd_repeat *k ) } /* for "kbd-reset" cmdline param */ -__initfunc(void amiga_kbd_reset_setup(char *str, int *ints)) +void __init amiga_kbd_reset_setup(char *str, int *ints) { } |