diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 13:20:06 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 13:20:06 (GMT) |
commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /sound/isa/cmi8330.c | |
parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
download | linux-fsl-qoriq-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/isa/cmi8330.c')
-rw-r--r-- | sound/isa/cmi8330.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index 8246aae..fe79a16 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -46,7 +46,6 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/isa.h> -#include <linux/slab.h> #include <linux/pnp.h> #include <linux/moduleparam.h> #include <sound/core.h> |