summaryrefslogtreecommitdiffstats
path: root/drivers/input/power.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 19:49:45 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 19:49:45 +0200
commit026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch)
tree2624a44924c625c367f3cebf937853b9da2de282 /drivers/input/power.c
parentMerge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff)
parent[PATCH] genirq: Fixup ARM devel merge (diff)
downloadlinux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.tar.xz
linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/input/power.c')
-rw-r--r--drivers/input/power.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/power.c b/drivers/input/power.c
index 526e6070600c..51a519e24b6d 100644
--- 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>