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
old mode 100644 (file)
new mode 100755 (executable)
index 3c71257..370bd0f
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -22,8 +22,13 @@ obj-$(CONFIG_INPUT_JOYSTICK) += joystick/
 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_XEN_KBDDEV_FRONTEND)      += xen-kbdfront.o
+obj-y += magnetometer/