Merge branch 'apei' into release

[~andy/linux] / drivers / input / input.c

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5edc41aa08f8cf56336365f75b514b2274d31dd5..db409d6bd5d2b9672ad94f370564f870bed25b19 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -24,7 +24,6 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/rcupdate.h>
-#include <linux/smp_lock.h>
 #include "input-compat.h"
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");