Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / input / Makefile

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 99af903bd3ce57c747e8869da4e9883d2d566263..2ae87b19caa891cfe21ce1b49bc5923e15909a99 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -22,3 +22,4 @@ obj-$(CONFIG_INPUT_TABLET)    += tablet/
 obj-$(CONFIG_INPUT_TOUCHSCREEN)        += touchscreen/
 obj-$(CONFIG_INPUT_MISC)       += misc/
 
+obj-$(CONFIG_INPUT_APMPOWER)   += apm-power.o