summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-01-18 18:08:57 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-01-18 18:08:57 -0800
commit665e407eac728b915d97df7d3937ef823dcf1aec (patch)
treead7073ca74ea08c2b021c4b557eab8fae00d0f8c /drivers/input
parent0fe28f54aa340811aef8e18546cfe0800c406e7b (diff)
[PATCH] Fix compile error in 98busmouse.c module
From: Dmitry Torokhov <dtor_core@ameritech.net> Fix 98busmouse compile error - have interrupt routine return IRQ_HANDLED
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/98busmouse.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/mouse/98busmouse.c b/drivers/input/mouse/98busmouse.c
index 566c9b26add8..d578813ee986 100644
--- a/drivers/input/mouse/98busmouse.c
+++ b/drivers/input/mouse/98busmouse.c
@@ -74,7 +74,7 @@ MODULE_PARM(pc98bm_irq, "i");
static int pc98bm_irq = PC98BM_IRQ;
static int pc98bm_used = 0;
-static void pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs);
static int pc98bm_open(struct input_dev *dev)
{
@@ -113,7 +113,7 @@ static struct input_dev pc98bm_dev = {
},
};
-static void pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
char dx, dy;
unsigned char buttons;
@@ -137,6 +137,8 @@ static void pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
input_sync(&pc98bm_dev);
outb(PC98BM_ENABLE_IRQ, PC98BM_CONTROL_PORT);
+
+ return IRQ_HANDLED;
}
#ifndef MODULE