diff options
author | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 01:59:58 +0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-09 01:59:58 +0400 |
commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /sound/pci/echoaudio/darla24.c | |
parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
download | linux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz |
Merge commit 'v2.6.34-rc6' into x86/cpu
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 @@ #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> |