Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus

[linux-imx.git] / drivers / hid / Makefile

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index ffd0d9826d84b91feb9a2bba86684dfac1569f9a..6f687287e2125168fbfa46ab0f8d9384a08dc797 100644 (file)
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -28,10 +28,7 @@ ifdef CONFIG_LOGIWHEELS_FF
        hid-logitech-y  += hid-lg4ff.o
 endif
 
-hid-wiimote-y          := hid-wiimote-core.o
-ifdef CONFIG_HID_WIIMOTE_EXT
-       hid-wiimote-y   += hid-wiimote-ext.o
-endif
+hid-wiimote-y          := hid-wiimote-core.o hid-wiimote-modules.o
 ifdef CONFIG_DEBUG_FS
        hid-wiimote-y   += hid-wiimote-debug.o
 endif