diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-12-17 13:29:07 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-12-17 13:29:07 -0500 |
| commit | ec66ee3797e5848356cf593c6ec7aabf30a00cf1 (patch) | |
| tree | 7ed5c84cc914644ffa1cd1b6a2b45db53fc224e8 /sound/sound_core.c | |
| parent | 1205065764f2eda3216ebe213143f69891ee3460 (diff) | |
| parent | b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff) | |
| download | op-kernel-dev-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.zip op-kernel-dev-ec66ee3797e5848356cf593c6ec7aabf30a00cf1.tar.gz | |
Merge commit 'v2.6.37-rc6' into for-2.6.38
Diffstat (limited to 'sound/sound_core.c')
| -rw-r--r-- | sound/sound_core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c index c03bbae..5580ace 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -104,7 +104,6 @@ module_exit(cleanup_soundcore); #include <linux/init.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/sound.h> |
