diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /sound/oss/cs46xx.c | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'sound/oss/cs46xx.c')
| -rw-r--r-- | sound/oss/cs46xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c index b1c5d8286e40..147c8a951137 100644 --- a/sound/oss/cs46xx.c +++ b/sound/oss/cs46xx.c | |||
| @@ -91,6 +91,7 @@ | |||
| 91 | #include <linux/poll.h> | 91 | #include <linux/poll.h> |
| 92 | #include <linux/ac97_codec.h> | 92 | #include <linux/ac97_codec.h> |
| 93 | #include <linux/mutex.h> | 93 | #include <linux/mutex.h> |
| 94 | #include <linux/mm.h> | ||
| 94 | 95 | ||
| 95 | #include <asm/io.h> | 96 | #include <asm/io.h> |
| 96 | #include <asm/dma.h> | 97 | #include <asm/dma.h> |