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
/
oss
/
i810_audio.c
diff --git
a/sound/oss/i810_audio.c
b/sound/oss/i810_audio.c
index
ddcddc2
..
c3c8a72
100644
(file)
--- a/
sound/oss/i810_audio.c
+++ b/
sound/oss/i810_audio.c
@@
-101,6
+101,7
@@
#include <linux/ac97_codec.h>
#include <linux/bitops.h>
#include <linux/mutex.h>
#include <linux/ac97_codec.h>
#include <linux/bitops.h>
#include <linux/mutex.h>
+#include <linux/mm.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
@@
-1523,9
+1524,9
@@
static void i810_channel_interrupt(struct i810_card *card)
#endif
}
#endif
}
-static irqreturn_t i810_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t i810_interrupt(int irq, void *dev_id)
{
{
- struct i810_card *card =
(struct i810_card *)
dev_id;
+ struct i810_card *card = dev_id;
u32 status;
spin_lock(&card->lock);
u32 status;
spin_lock(&card->lock);