diff options
author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /sound/isa/sb/sb8.c | |
parent | x86: Clean up the hypervisor layer (diff) | |
parent | Linux 2.6.34-rc6 (diff) | |
download | linux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz linux-d7be0ce6afb1df60bc786f57410407ceae92b994.zip |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'sound/isa/sb/sb8.c')
-rw-r--r-- | sound/isa/sb/sb8.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index 3cd57ee54660..81284a8fa0ce 100644 --- a/sound/isa/sb/sb8.c +++ b/sound/isa/sb/sb8.c @@ -22,7 +22,6 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/isa.h> -#include <linux/slab.h> #include <linux/ioport.h> #include <linux/moduleparam.h> #include <sound/core.h> |