summaryrefslogtreecommitdiff
path: root/drivers/iio/imu/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-06-08 10:26:46 +0300
committerIngo Molnar <mingo@kernel.org>2016-06-08 10:26:46 +0300
commit616d1c1b98ac79f30216a57a170dd7cea19b3df3 (patch)
tree6f244c2e5a7160190e73bc82b4cd7fa7bb22ee31 /drivers/iio/imu/Kconfig
parenta4f144ebbdf6f7807c477bce8e136047ed27321f (diff)
parentc8ae067f2635be0f8c7e5db1bb74b757d623e05b (diff)
downloadlinux-616d1c1b98ac79f30216a57a170dd7cea19b3df3.tar.xz
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iio/imu/Kconfig')
-rw-r--r--drivers/iio/imu/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/imu/Kconfig b/drivers/iio/imu/Kconfig
index 5e610f7de5aa..1f1ad41ef881 100644
--- a/drivers/iio/imu/Kconfig
+++ b/drivers/iio/imu/Kconfig
@@ -25,6 +25,8 @@ config ADIS16480
Say yes here to build support for Analog Devices ADIS16375, ADIS16480,
ADIS16485, ADIS16488 inertial sensors.
+source "drivers/iio/imu/bmi160/Kconfig"
+
config KMX61
tristate "Kionix KMX61 6-axis accelerometer and magnetometer"
depends on I2C