Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasem...

[powerpc.git] / drivers / input / Makefile

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 8a2dd98..99af903 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -8,11 +8,11 @@ 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_EVBUG)      += evbug.o
 
 obj-$(CONFIG_INPUT_KEYBOARD)   += keyboard/