Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[linux-2.6-omap-h63xx.git] / drivers / input / misc / Makefile

diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 8b2f7799e25c98e2e33668b6cdfb6d0299c796ce..ebd39f291d259b74325a719e56da7d193e75d4b5 100644 (file)
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -4,7 +4,6 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_INPUT_POLLDEV)            += input-polldev.o
 obj-$(CONFIG_INPUT_SPARCSPKR)          += sparcspkr.o
 obj-$(CONFIG_INPUT_PCSPKR)             += pcspkr.o
 obj-$(CONFIG_INPUT_M68K_BEEP)          += m68kspkr.o
@@ -19,3 +18,4 @@ obj-$(CONFIG_INPUT_POWERMATE)         += powermate.o
 obj-$(CONFIG_INPUT_YEALINK)            += yealink.o
 obj-$(CONFIG_HP_SDC_RTC)               += hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_UINPUT)             += uinput.o
+obj-$(CONFIG_INPUT_APANEL)             += apanel.o