From 0ae8dceaebe3659ee0c3352c08125f403e77ebca Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 28 Sep 1999 22:25:29 +0000
Subject: Merge with 2.3.10.

---
 drivers/char/amigamouse.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'drivers/char/amigamouse.c')

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)
 {
-- 
cgit v1.2.3