diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-11 18:30:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-11 18:30:50 +0200 |
| commit | 5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b (patch) | |
| tree | f43f81ab67d152c148bd3dfc1a0683d2c8306014 /drivers/iio/imu | |
| parent | staging: vme: fix bare use of 'unsigned' (diff) | |
| parent | Linux 4.6-rc3 (diff) | |
| download | linux-5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b.tar.xz linux-5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b.zip | |
Merge 4.6-rc3 into staging-next
This resolves a lot of merge issues with PAGE_CACHE_* changes, and an
iio driver merge issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/imu')
| -rw-r--r-- | drivers/iio/imu/inv_mpu6050/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iio/imu/inv_mpu6050/Kconfig b/drivers/iio/imu/inv_mpu6050/Kconfig index a7f557af4389..847455a2d6bb 100644 --- a/drivers/iio/imu/inv_mpu6050/Kconfig +++ b/drivers/iio/imu/inv_mpu6050/Kconfig @@ -9,9 +9,8 @@ config INV_MPU6050_IIO config INV_MPU6050_I2C tristate "Invensense MPU6050 devices (I2C)" - depends on I2C + depends on I2C_MUX select INV_MPU6050_IIO - select I2C_MUX select REGMAP_I2C help This driver supports the Invensense MPU6050 devices. |