diff --git a/[refs] b/[refs]
index 8d4184f1bc7b..343e29777b28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4658c898837ed2678422f3e69ee9d050e8e9cf8
+refs/heads/master: e0bcb775e8643816a07bf52c6587bb269695fee9
diff --git a/trunk/drivers/staging/iio/imu/Kconfig b/trunk/drivers/staging/iio/imu/Kconfig
index 48a712e74f98..31a6233a2068 100644
--- a/trunk/drivers/staging/iio/imu/Kconfig
+++ b/trunk/drivers/staging/iio/imu/Kconfig
@@ -6,9 +6,8 @@ comment "Inertial measurement units"
 config ADIS16300
 	tristate "Analog Devices ADIS16300 IMU SPI driver"
 	depends on SPI
-	select IIO_SW_RING
-	select IIO_RING_BUFFER
-	select IIO_TRIGGER
+	select IIO_SW_RING if IIO_RING_BUFFER
+	select IIO_TRIGGER if IIO_RING_BUFFER
 	help
 	  Say yes here to build support for Analog Devices adis16300 four degrees
 	  of freedom inertial sensor.
@@ -25,9 +24,8 @@ config ADIS16350
 config ADIS16400
 	tristate "Analog Devices ADIS16400/5 IMU SPI driver"
 	depends on SPI
-	select IIO_SW_RING
-	select IIO_RING_BUFFER
-	select IIO_TRIGGER
+	select IIO_SW_RING if IIO_RING_BUFFER
+	select IIO_TRIGGER if IIO_RING_BUFFER
 	help
 	  Say yes here to build support for Analog Devices adis16400/5 triaxial
 	  inertial sensor with Magnetometer.