diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-05-03 09:17:01 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-05-03 09:17:01 +0200 |
commit | 53ba4f2fa73225113a488584df0d85d3cba52943 (patch) | |
tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /sound/synth/emux | |
parent | bd6d29c25bb1a24a4c160ec5de43e0004e01f72b (diff) | |
parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
download | op-kernel-dev-53ba4f2fa73225113a488584df0d85d3cba52943.zip op-kernel-dev-53ba4f2fa73225113a488584df0d85d3cba52943.tar.gz |
Merge commit 'v2.6.34-rc6' into core/locking
Diffstat (limited to 'sound/synth/emux')
-rw-r--r-- | sound/synth/emux/emux_proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c index 687e6a1..58a32a1 100644 --- a/sound/synth/emux/emux_proc.c +++ b/sound/synth/emux/emux_proc.c @@ -19,7 +19,6 @@ */ #include <linux/wait.h> -#include <linux/slab.h> #include <sound/core.h> #include <sound/emux_synth.h> #include <sound/info.h> |