git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
pnp
/
resource.c
diff --git
a/drivers/pnp/resource.c
b/drivers/pnp/resource.c
index
5c8ec21
..
a685fbe
100644
(file)
--- a/
drivers/pnp/resource.c
+++ b/
drivers/pnp/resource.c
@@
-348,7
+348,7
@@
int pnp_check_mem(struct pnp_dev * dev, int idx)
return 1;
}
-static irqreturn_t pnp_test_handler(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t pnp_test_handler(int irq, void *dev_id)
{
return IRQ_HANDLED;
}