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/mia.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/mia.c')
| -rw-r--r-- | sound/pci/echoaudio/mia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/mia.c b/sound/pci/echoaudio/mia.c index cc2bbfc65327..9cdf14cfdd74 100644 --- a/sound/pci/echoaudio/mia.c +++ b/sound/pci/echoaudio/mia.c | |||
| @@ -50,9 +50,9 @@ | |||
| 50 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 51 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
| 52 | #include <linux/pci.h> | 52 | #include <linux/pci.h> |
| 53 | #include <linux/slab.h> | ||
| 54 | #include <linux/moduleparam.h> | 53 | #include <linux/moduleparam.h> |
| 55 | #include <linux/firmware.h> | 54 | #include <linux/firmware.h> |
| 55 | #include <linux/slab.h> | ||
| 56 | #include <sound/core.h> | 56 | #include <sound/core.h> |
| 57 | #include <sound/info.h> | 57 | #include <sound/info.h> |
| 58 | #include <sound/control.h> | 58 | #include <sound/control.h> |