aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sensor/Makefile
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
commit68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch)
tree5fb2d14340332062e416246c5759adcaa64a2340 /drivers/sensor/Makefile
parent17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff)
parentb99374450c03bf5081b88995d91d34fb9b2fd040 (diff)
downloadkernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'drivers/sensor/Makefile')
-rw-r--r--drivers/sensor/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/sensor/Makefile b/drivers/sensor/Makefile
index 44adf31..195f0f9 100644
--- a/drivers/sensor/Makefile
+++ b/drivers/sensor/Makefile
@@ -6,7 +6,11 @@
obj-$(CONFIG_SENSORS_CORE) += sensors_core.o
# accelerometer_sensor
+ifeq ($(CONFIG_MACH_KONA_SENSOR),y)
+obj-$(CONFIG_SENSORS_K3DH) += k3dh_kona.o
+else
obj-$(CONFIG_SENSORS_K3DH) += k3dh.o
+endif
obj-$(CONFIG_SENSORS_BMA254) += bma254_driver.o
# gyro_sensor
obj-$(CONFIG_SENSORS_K3G) += k3g.o
@@ -15,6 +19,8 @@ obj-$(CONFIG_SENSORS_LSM330DLC) += lsm330dlc_accel.o lsm330dlc_gyro.o
# magnetic_sensor
obj-$(CONFIG_SENSORS_AK8975C) += ak8975.o
obj-$(CONFIG_SENSORS_AK8963C) += ak8963.o
+obj-$(CONFIG_SENSORS_YAS532) += yas_mag_kernel_driver.o
+obj-$(CONFIG_SENSORS_YAS_ORI) += yas_ori_kernel_driver.o
# optical_sensor
obj-$(CONFIG_SENSORS_CM3663) += cm3663.o
obj-$(CONFIG_SENSORS_TAOS) += taos.o