Pull osi into release branch

[sfrench/cifs-2.6.git] / sound / core / control.c

diff --git a/sound/core/control.c b/sound/core/control.c
index 86de7258b76d04a0695251e94ecfcbc2e63c10a4..1f1ab9c1b668c5704badb84379f809439b085c09 100644 (file)
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -22,7 +22,6 @@
 #include <sound/driver.h>
 #include <linux/threads.h>
 #include <linux/interrupt.h>
-#include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/time.h>