diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 02:08:44 +0200 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /sound/pci/echoaudio/indigodj.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
| download | kernel_samsung_smdk4412-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.zip kernel_samsung_smdk4412-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.gz kernel_samsung_smdk4412-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.bz2 | |
Merge branch 'master' into for-next
Diffstat (limited to 'sound/pci/echoaudio/indigodj.c')
| -rw-r--r-- | sound/pci/echoaudio/indigodj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c index 8816b0b..3550715 100644 --- a/sound/pci/echoaudio/indigodj.c +++ b/sound/pci/echoaudio/indigodj.c @@ -42,9 +42,9 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/pci.h> -#include <linux/slab.h> #include <linux/moduleparam.h> #include <linux/firmware.h> +#include <linux/slab.h> #include <sound/core.h> #include <sound/info.h> #include <sound/control.h> |