diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /sound/oss/soundcard.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'sound/oss/soundcard.c')
| -rw-r--r-- | sound/oss/soundcard.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index fde7c12fe5da..2d9c51312622 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <asm/dma.h> | 36 | #include <asm/dma.h> |
| 37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 38 | #include <linux/wait.h> | 38 | #include <linux/wait.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> |
| 41 | #include <linux/major.h> | 40 | #include <linux/major.h> |
| 42 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |