diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /sound/pci/als4000.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'sound/pci/als4000.c')
| -rw-r--r-- | sound/pci/als4000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index d75cf7b06426..6cf1de8042e8 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | #include <asm/io.h> | 68 | #include <asm/io.h> |
| 69 | #include <linux/init.h> | 69 | #include <linux/init.h> |
| 70 | #include <linux/pci.h> | 70 | #include <linux/pci.h> |
| 71 | #include <linux/slab.h> | ||
| 72 | #include <linux/gameport.h> | 71 | #include <linux/gameport.h> |
| 73 | #include <linux/moduleparam.h> | 72 | #include <linux/moduleparam.h> |
| 74 | #include <linux/dma-mapping.h> | 73 | #include <linux/dma-mapping.h> |