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
/
es1371.c
diff --git
a/sound/oss/es1371.c
b/sound/oss/es1371.c
index
a2ffe72
..
cc282a0
100644
(file)
--- a/
sound/oss/es1371.c
+++ b/
sound/oss/es1371.c
@@
-130,6
+130,7
@@
#include <linux/wait.h>
#include <linux/dma-mapping.h>
#include <linux/mutex.h>
#include <linux/wait.h>
#include <linux/dma-mapping.h>
#include <linux/mutex.h>
+#include <linux/mm.h>
#include <asm/io.h>
#include <asm/page.h>
#include <asm/io.h>
#include <asm/page.h>
@@
-1100,9
+1101,9
@@
static void es1371_handle_midi(struct es1371_state *s)
outb((s->midi.ocnt > 0) ? UCTRL_RXINTEN | UCTRL_ENA_TXINT : UCTRL_RXINTEN, s->io+ES1371_REG_UART_CONTROL);
}
outb((s->midi.ocnt > 0) ? UCTRL_RXINTEN | UCTRL_ENA_TXINT : UCTRL_RXINTEN, s->io+ES1371_REG_UART_CONTROL);
}
-static irqreturn_t es1371_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t es1371_interrupt(int irq, void *dev_id)
{
{
- struct es1371_state *s =
(struct es1371_state *)
dev_id;
+ struct es1371_state *s = dev_id;
unsigned int intsrc, sctl;
/* fastpath out, to ease interrupt sharing */
unsigned int intsrc, sctl;
/* fastpath out, to ease interrupt sharing */