diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /sound/pci/echoaudio/gina20.c | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/pci/echoaudio/gina20.c')
| -rw-r--r-- | sound/pci/echoaudio/gina20.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/gina20.c b/sound/pci/echoaudio/gina20.c index 2364f8a1bc21..050e54aa693f 100644 --- a/sound/pci/echoaudio/gina20.c +++ b/sound/pci/echoaudio/gina20.c | |||
| @@ -44,9 +44,9 @@ | |||
| 44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 45 | #include <linux/interrupt.h> | 45 | #include <linux/interrupt.h> |
| 46 | #include <linux/pci.h> | 46 | #include <linux/pci.h> |
| 47 | #include <linux/slab.h> | ||
| 48 | #include <linux/moduleparam.h> | 47 | #include <linux/moduleparam.h> |
| 49 | #include <linux/firmware.h> | 48 | #include <linux/firmware.h> |
| 49 | #include <linux/slab.h> | ||
| 50 | #include <sound/core.h> | 50 | #include <sound/core.h> |
| 51 | #include <sound/info.h> | 51 | #include <sound/info.h> |
| 52 | #include <sound/control.h> | 52 | #include <sound/control.h> |