5 files changed, 8 insertions, 11 deletions

diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
index b8daf1b2ea06..8498e9dcda68 100644
--- a/drivers/iio/gyro/Kconfig
+++ b/drivers/iio/gyro/Kconfig
@@ -10,6 +10,13 @@ config ADIS16080
           Say yes here to build support for Analog Devices ADIS16080, ADIS16100 Yaw
           Rate Gyroscope with SPI.
 
+config ADIS16130
+        tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices ADIS16130 High Precision
+          Angular Rate Sensor driver.
+
 config ADIS16136
         tristate "Analog devices ADIS16136 and similar gyroscopes driver"
         depends on SPI_MASTER
diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile
index 225d289082e6..e9dc034aa18b 100644
--- a/drivers/iio/gyro/Makefile
+++ b/drivers/iio/gyro/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_ADIS16080) += adis16080.o
+obj-$(CONFIG_ADIS16130) += adis16130.o
 obj-$(CONFIG_ADIS16136) += adis16136.o
 obj-$(CONFIG_ADXRS450) += adxrs450.o
 
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/iio/gyro/adis16130.c
index 89794350be61..129acdf801a4 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/iio/gyro/adis16130.c
@@ -183,7 +183,6 @@ error_ret:
         return ret;
 }
 
-/* fixme, confirm ordering in this function */
 static int adis16130_remove(struct spi_device *spi)
 {
         iio_device_unregister(spi_get_drvdata(spi));
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
index 836066287192..b4333715536e 100644
--- a/drivers/staging/iio/gyro/Kconfig
+++ b/drivers/staging/iio/gyro/Kconfig
@@ -10,13 +10,6 @@ config ADIS16060
           Say yes here to build support for Analog Devices adis16060 wide bandwidth
           yaw rate gyroscope with SPI.
 
-config ADIS16130
-        tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
-        depends on SPI
-        help
-          Say yes here to build support for Analog Devices ADIS16130 High Precision
-          Angular Rate Sensor driver.
-
 config ADIS16260
         tristate "Analog Devices ADIS16260 Digital Gyroscope Sensor SPI driver"
         depends on SPI
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile
index 98e650061a3a..975f95b141da 100644
--- a/drivers/staging/iio/gyro/Makefile
+++ b/drivers/staging/iio/gyro/Makefile
@@ -5,8 +5,5 @@
 adis16060-y             := adis16060_core.o
 obj-$(CONFIG_ADIS16060) += adis16060.o
 
-adis16130-y             := adis16130_core.o
-obj-$(CONFIG_ADIS16130) += adis16130.o
-
 adis16260-y             := adis16260_core.o
 obj-$(CONFIG_ADIS16260) += adis16260.o