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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
aoa
/
soundbus
/
i2sbus
/
i2sbus-core.c
diff --git
a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index
23190aa
..
e593a13
100644
(file)
--- a/
sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/
sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@
-93,7
+93,7
@@
static void i2sbus_release_dev(struct device *dev)
kfree(i2sdev);
}
kfree(i2sdev);
}
-static irqreturn_t i2sbus_bus_intr(int irq, void *devid
, struct pt_regs *regs
)
+static irqreturn_t i2sbus_bus_intr(int irq, void *devid)
{
struct i2sbus_dev *dev = devid;
u32 intreg;
{
struct i2sbus_dev *dev = devid;
u32 intreg;
@@
-165,8
+165,7
@@
static int i2sbus_add_dev(struct macio_dev *macio,
static const char *rnames[] = { "i2sbus: %s (control)",
"i2sbus: %s (tx)",
"i2sbus: %s (rx)" };
static const char *rnames[] = { "i2sbus: %s (control)",
"i2sbus: %s (tx)",
"i2sbus: %s (rx)" };
- static irqreturn_t (*ints[])(int irq, void *devid,
- struct pt_regs *regs) = {
+ static irq_handler_t ints[] = {
i2sbus_bus_intr,
i2sbus_tx_intr,
i2sbus_rx_intr
i2sbus_bus_intr,
i2sbus_tx_intr,
i2sbus_rx_intr