Merge commit 'v2.6.31-rc7' into irq/core

[mv-sheeva.git] / drivers / telephony / phonedev.c

diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index b52cc830c0b49c90ba097bdeadfc4140d9c29d8f..f3873f650bb43f7f68f79ee87a8c8cdf13784b3a 100644 (file)
--- a/drivers/telephony/phonedev.c
+++ b/drivers/telephony/phonedev.c
@@ -23,7 +23,6 @@
 #include <linux/errno.h>
 #include <linux/phonedev.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>