Merge commit 'v3.1-rc4' into next

[mirror_ubuntu-artful-kernel.git] / drivers / input / misc / Makefile

diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index ac65eb22bcecbbf4f5eb11ba6a0fc1daf717b5f0..53a8d0faad52fcebec83d70056ddc7ffd592a264 100644 (file)
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_INPUT_SGI_BTNS)          += sgi_btns.o
 obj-$(CONFIG_INPUT_SPARCSPKR)          += sparcspkr.o
 obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)  += twl4030-pwrbutton.o
 obj-$(CONFIG_INPUT_TWL4030_VIBRA)      += twl4030-vibra.o
+obj-$(CONFIG_INPUT_TWL6040_VIBRA)      += twl6040-vibra.o
 obj-$(CONFIG_INPUT_UINPUT)             += uinput.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)       += wistron_btns.o
 obj-$(CONFIG_INPUT_WM831X_ON)          += wm831x-on.o