summaryrefslogtreecommitdiffstats
path: root/sound/pci/echoaudio/gina24.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-05-17 16:30:58 -0700
committerDan Williams <dan.j.williams@intel.com>2010-05-17 16:30:58 -0700
commit0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch)
treefcf504879883763557e696eff81427b1ab78f76b /sound/pci/echoaudio/gina24.c
parent058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff)
parentcaa20d974c86af496b419eef70010e63b7fab7ac (diff)
downloadblackbird-op-linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.gz
blackbird-op-linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'sound/pci/echoaudio/gina24.c')
-rw-r--r--sound/pci/echoaudio/gina24.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c
index 616b55825a19..5748fc6d29d6 100644
--- a/sound/pci/echoaudio/gina24.c
+++ b/sound/pci/echoaudio/gina24.c
@@ -50,9 +50,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>
OpenPOWER on IntegriCloud