---

yaml --- r: 354220 b: refs/heads/master c: a9fbbee h: refs/heads/master v: v3
git-mirror · Jan 26, 2013 · 6c635f0 · 6c635f0
1 parent 013491d
commit 6c635f0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668cce24965a454f110c5835e0a2198a9aea55af
+refs/heads/master: a9fbbee8a2e90f88ff605ec72b388ec20b808ee4
diff --git a/trunk/drivers/iio/gyro/Kconfig b/trunk/drivers/iio/gyro/Kconfig
@@ -3,6 +3,13 @@
 #
 menu "Digital gyroscope sensors"
 
+config ADIS16080
+	tristate "Analog Devices ADIS16080/100 Yaw Rate Gyroscope with SPI driver"
+	depends on SPI
+	help
+	  Say yes here to build support for Analog Devices ADIS16080, ADIS16100 Yaw
+	  Rate Gyroscope with SPI.
+
 config ADIS16136
 	tristate "Analog devices ADIS16136 and similar gyroscopes driver"
 	depends on SPI_MASTER

diff --git a/trunk/drivers/iio/gyro/Makefile b/trunk/drivers/iio/gyro/Makefile
@@ -2,5 +2,6 @@
 # Makefile for industrial I/O gyroscope sensor drivers
 #
 
+obj-$(CONFIG_ADIS16080) += adis16080.o
 obj-$(CONFIG_ADIS16136) += adis16136.o
 obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o
diff --git a/...drivers/staging/iio/gyro/adis16080_core.c → trunk/drivers/iio/gyro/adis16080.c b/...drivers/staging/iio/gyro/adis16080_core.c → trunk/drivers/iio/gyro/adis16080.c
@@ -228,7 +228,6 @@ static int adis16080_probe(struct spi_device *spi)
 	return ret;
 }
 
-/* fixme, confirm ordering in this function */
 static int adis16080_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));

diff --git a/trunk/drivers/staging/iio/gyro/Kconfig b/trunk/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 ADIS16080
-	tristate "Analog Devices ADIS16080/100 Yaw Rate Gyroscope with SPI driver"
-	depends on SPI
-	help
-	  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

diff --git a/trunk/drivers/staging/iio/gyro/Makefile b/trunk/drivers/staging/iio/gyro/Makefile
@@ -5,9 +5,6 @@
 adis16060-y             := adis16060_core.o
 obj-$(CONFIG_ADIS16060) += adis16060.o
 
-adis16080-y             := adis16080_core.o
-obj-$(CONFIG_ADIS16080) += adis16080.o
-
 adis16130-y             := adis16130_core.o
 obj-$(CONFIG_ADIS16130) += adis16130.o