Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / drivers / input / Makefile

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index a005b1d..99af903 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -8,16 +8,17 @@ obj-$(CONFIG_INPUT)           += input-core.o
 input-core-objs := input.o ff-core.o
 
 obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o
+obj-$(CONFIG_INPUT_POLLDEV)    += input-polldev.o
 
 obj-$(CONFIG_INPUT_MOUSEDEV)   += mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)     += joydev.o
 obj-$(CONFIG_INPUT_EVDEV)      += evdev.o
-obj-$(CONFIG_INPUT_TSDEV)      += tsdev.o
-obj-$(CONFIG_INPUT_POWER)      += power.o
 obj-$(CONFIG_INPUT_EVBUG)      += evbug.o
 
 obj-$(CONFIG_INPUT_KEYBOARD)   += keyboard/
 obj-$(CONFIG_INPUT_MOUSE)      += mouse/
 obj-$(CONFIG_INPUT_JOYSTICK)   += joystick/
+obj-$(CONFIG_INPUT_TABLET)     += tablet/
 obj-$(CONFIG_INPUT_TOUCHSCREEN)        += touchscreen/
 obj-$(CONFIG_INPUT_MISC)       += misc/
+