Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next

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

diff --git a/drivers/input/sensors/accel/Makefile b/drivers/input/sensors/accel/Makefile
index 67226f1737708648d8726fbcb6b7453f541ac4a8..87dbb03bac96e3589cea4a86d6ff1de7af4f454e 100755 (executable)
--- a/drivers/input/sensors/accel/Makefile
+++ b/drivers/input/sensors/accel/Makefile
@@ -1,5 +1,10 @@
-obj-$(CONFIG_GS_KXTIK)                 += kxtik.o\r
-obj-$(CONFIG_GS_MMA8452)       += mma8452.o\r
-obj-$(CONFIG_GS_LIS3DH)        += lis3dh.o\r
+obj-$(CONFIG_GS_KXTIK)                 += kxtik.o
+obj-$(CONFIG_GS_KXTJ9)                 += kxtj9.o
+obj-$(CONFIG_GS_MMA8452)       += mma8452.o
+obj-$(CONFIG_GS_LIS3DH)        += lis3dh.o
 obj-$(CONFIG_GS_MMA7660)       += mma7660.o
-obj-$(CONFIG_GS_MXC6225)    += mxc622x.o\r
+obj-$(CONFIG_GS_MXC6225)    += mxc622x.o
+obj-$(CONFIG_GS_DMT10)      += dmard10.o
+obj-$(CONFIG_GS_LSM303D)    += lsm303d.o
+obj-$(CONFIG_GS_MC3230)    += mc3230.o
+obj-$(CONFIG_MPU6880_ACC)   += mpu6880_acc.o