Merge branch 'master' into gfs2

[mv-sheeva.git] / drivers / input / power.c

diff --git a/drivers/input/power.c b/drivers/input/power.c
index 526e6070600c8a02a29df0283d55fcae79217b0f..51a519e24b6d07bd146206d47cd1293719dedb48 100644 (file)
--- a/drivers/input/power.c
+++ b/drivers/input/power.c
@@ -28,7 +28,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/input.h>
 #include <linux/slab.h>
 #include <linux/init.h>