Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / input / Makefile

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index f9357d4c0bc7b04e090471262332ff4a0638e12e..370bd0f94f7358bb55faf6b8fcec464277afc049 100755 (executable)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -9,6 +9,7 @@ input-core-objs := input.o input-compat.o ff-core.o
 
 obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o
 obj-$(CONFIG_INPUT_POLLDEV)    += input-polldev.o
+obj-$(CONFIG_INPUT_SPARSEKMAP) += sparse-keymap.o
 
 obj-$(CONFIG_INPUT_MOUSEDEV)   += mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)     += joydev.o
@@ -22,10 +23,12 @@ obj-$(CONFIG_INPUT_TABLET)  += tablet/
 obj-$(CONFIG_INPUT_TOUCHSCREEN)        += touchscreen/
 obj-$(CONFIG_INPUT_MISC)       += misc/
 obj-$(CONFIG_G_SENSOR_DEVICE)  += gsensor/
+obj-$(CONFIG_GYRO_SENSOR_DEVICE)       += gyroscope/
 obj-$(CONFIG_INPUT_JOGBALL)    += jogball/
+obj-$(CONFIG_LIGHT_SENSOR_DEVICE) += lightsensor/
 
 obj-$(CONFIG_INPUT_APMPOWER)   += apm-power.o
 obj-$(CONFIG_INPUT_KEYRESET)   += keyreset.o
-obj-$(CONFIG_LIGHT_SENSOR_DEVICE) += lightsensor/
+
 obj-$(CONFIG_XEN_KBDDEV_FRONTEND)      += xen-kbdfront.o
-obj-y += magnetometer/
\ No newline at end of file
+obj-y += magnetometer/