diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /sound/pci/echoaudio/darla20.c | |
| parent | 35f6cd4a06432034665a1499ca4b022437423aac (diff) | |
| parent | 83515bc7df812555e20cda48614674e2f346f9f5 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound/pci/echoaudio/darla20.c')
| -rw-r--r-- | sound/pci/echoaudio/darla20.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/darla20.c b/sound/pci/echoaudio/darla20.c index a65bafe0800f..fe7ad64dccd7 100644 --- a/sound/pci/echoaudio/darla20.c +++ b/sound/pci/echoaudio/darla20.c | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 41 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
| 42 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/moduleparam.h> | 43 | #include <linux/moduleparam.h> |
| 45 | #include <linux/firmware.h> | 44 | #include <linux/firmware.h> |
| 45 | #include <linux/slab.h> | ||
| 46 | #include <sound/core.h> | 46 | #include <sound/core.h> |
| 47 | #include <sound/info.h> | 47 | #include <sound/info.h> |
| 48 | #include <sound/control.h> | 48 | #include <sound/control.h> |