Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent

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

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 99af903..98c4f9a 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -22,3 +22,6 @@ obj-$(CONFIG_INPUT_TABLET)    += tablet/
 obj-$(CONFIG_INPUT_TOUCHSCREEN)        += touchscreen/
 obj-$(CONFIG_INPUT_MISC)       += misc/
 
+obj-$(CONFIG_INPUT_APMPOWER)   += apm-power.o
+
+obj-$(CONFIG_XEN_KBDDEV_FRONTEND)      += xen-kbdfront.o