projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
[powerpc.git]
/
drivers
/
block
/
xd.c
diff --git
a/drivers/block/xd.c
b/drivers/block/xd.c
index
ebf3025
..
10cc387
100644
(file)
--- a/
drivers/block/xd.c
+++ b/
drivers/block/xd.c
@@
-462,8
+462,7
@@
static void xd_recalibrate (u_char drive)
}
/* xd_interrupt_handler: interrupt service routine */
}
/* xd_interrupt_handler: interrupt service routine */
-static irqreturn_t xd_interrupt_handler(int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t xd_interrupt_handler(int irq, void *dev_id)
{
if (inb(XD_STATUS) & STAT_INTERRUPT) { /* check if it was our device */
#ifdef DEBUG_OTHER
{
if (inb(XD_STATUS) & STAT_INTERRUPT) { /* check if it was our device */
#ifdef DEBUG_OTHER