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/echoaudio/layla20.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'sound/pci/echoaudio/layla20.c')
| -rw-r--r-- | sound/pci/echoaudio/layla20.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/layla20.c b/sound/pci/echoaudio/layla20.c index 8c3f5c5b5301..d3a98c5dac86 100644 --- a/sound/pci/echoaudio/layla20.c +++ b/sound/pci/echoaudio/layla20.c | |||
| @@ -49,9 +49,9 @@ | |||
| 49 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 50 | #include <linux/interrupt.h> | 50 | #include <linux/interrupt.h> |
| 51 | #include <linux/pci.h> | 51 | #include <linux/pci.h> |
| 52 | #include <linux/slab.h> | ||
| 53 | #include <linux/moduleparam.h> | 52 | #include <linux/moduleparam.h> |
| 54 | #include <linux/firmware.h> | 53 | #include <linux/firmware.h> |
| 54 | #include <linux/slab.h> | ||
| 55 | #include <sound/core.h> | 55 | #include <sound/core.h> |
| 56 | #include <sound/info.h> | 56 | #include <sound/info.h> |
| 57 | #include <sound/control.h> | 57 | #include <sound/control.h> |