diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 05:59:37 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 08:20:42 -0400 |
| commit | dbb6be6d5e974c42bbecd183effaa0df69e1dd8b (patch) | |
| tree | 5735cb47e70853d057a9881dd0ce44b83e88fa63 /sound/pci/echoaudio/darla24.c | |
| parent | 6a867a395558a7f882d041783e4cdea6744ca2bf (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'sound/pci/echoaudio/darla24.c')
| -rw-r--r-- | sound/pci/echoaudio/darla24.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/darla24.c b/sound/pci/echoaudio/darla24.c index 0a6c50bcd758..d1fd34b1a8e3 100644 --- a/sound/pci/echoaudio/darla24.c +++ b/sound/pci/echoaudio/darla24.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> |