Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[~andy/linux] / drivers / mfd / ucb1x00-ts.c

diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index 2d03bf791cebe4abf2480ae549de7051db3a60ef..38e815a2e87135227f16095607a2a588a38d6aab 100644 (file)
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -21,7 +21,6 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/sched.h>
 #include <linux/completion.h>
 #include <linux/delay.h>