summaryrefslogtreecommitdiffstats
path: root/drivers/input/Makefile
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-12-12 23:41:41 +0100
committerDave Jones <davej@redhat.com>2006-12-12 23:41:41 +0100
commitc4366889dda8110247be59ca41fddb82951a8c26 (patch)
tree705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /drivers/input/Makefile
parent[CPUFREQ] Longhaul - Add support for CN400 (diff)
parent[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem (diff)
downloadlinux-c4366889dda8110247be59ca41fddb82951a8c26.tar.xz
linux-c4366889dda8110247be59ca41fddb82951a8c26.zip
Merge ../linus
Conflicts: drivers/cpufreq/cpufreq.c
Diffstat (limited to 'drivers/input/Makefile')
-rw-r--r--drivers/input/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index a005b1df5f1a..da575deb3c7a 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_INPUT_MOUSE) += mouse/
obj-$(CONFIG_INPUT_JOYSTICK) += joystick/
obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/
obj-$(CONFIG_INPUT_MISC) += misc/
+