diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /sound/pci/echoaudio/echo3g.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/pci/echoaudio/echo3g.c')
| -rw-r--r-- | sound/pci/echoaudio/echo3g.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/echo3g.c b/sound/pci/echoaudio/echo3g.c index f5142796989b..1dffdc54416d 100644 --- a/sound/pci/echoaudio/echo3g.c +++ b/sound/pci/echoaudio/echo3g.c | |||
| @@ -51,9 +51,9 @@ | |||
| 51 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 52 | #include <linux/interrupt.h> | 52 | #include <linux/interrupt.h> |
| 53 | #include <linux/pci.h> | 53 | #include <linux/pci.h> |
| 54 | #include <linux/slab.h> | ||
| 55 | #include <linux/moduleparam.h> | 54 | #include <linux/moduleparam.h> |
| 56 | #include <linux/firmware.h> | 55 | #include <linux/firmware.h> |
| 56 | #include <linux/slab.h> | ||
| 57 | #include <sound/core.h> | 57 | #include <sound/core.h> |
| 58 | #include <sound/info.h> | 58 | #include <sound/info.h> |
| 59 | #include <sound/control.h> | 59 | #include <sound/control.h> |