summaryrefslogtreecommitdiffstats
path: root/drivers/char/amigamouse.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
commit0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch)
tree5085c389f09da78182b899d19fe1068b619a69dd /drivers/char/amigamouse.c
parent273767781288c35c9d679e908672b9996cda4c34 (diff)
Merge with 2.3.10.
Diffstat (limited to 'drivers/char/amigamouse.c')
-rw-r--r--drivers/char/amigamouse.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/amigamouse.c b/drivers/char/amigamouse.c
index e62ea5753..70e20b887 100644
--- a/drivers/char/amigamouse.c
+++ b/drivers/char/amigamouse.c
@@ -309,7 +309,7 @@ static struct miscdevice amiga_mouse = {
AMIGAMOUSE_MINOR, "amigamouse", &amiga_mouse_fops
};
-__initfunc(int amiga_mouse_init(void))
+int __init amiga_mouse_init(void)
{
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_MOUSE))
return -ENODEV;
@@ -333,7 +333,6 @@ __initfunc(int amiga_mouse_init(void))
}
#ifdef MODULE
-#include <asm/setup.h>
int init_module(void)
{