diff options
| -rw-r--r-- | drivers/iio/gyro/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/iio/gyro/Makefile | 1 | ||||
| -rw-r--r-- | drivers/iio/gyro/adis16080.c (renamed from drivers/staging/iio/gyro/adis16080_core.c) | 1 | ||||
| -rw-r--r-- | drivers/staging/iio/gyro/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/staging/iio/gyro/Makefile | 3 |
5 files changed, 8 insertions, 11 deletions
diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig index 96b68f63a902..752ac8a3448b 100644 --- a/drivers/iio/gyro/Kconfig +++ b/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/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile index 702a058907e3..9b090ee084d3 100644 --- a/drivers/iio/gyro/Makefile +++ b/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 b/drivers/iio/gyro/adis16080.c index 098a0a18ce2d..1861287911f1 100644 --- a/drivers/staging/iio/gyro/adis16080_core.c +++ b/drivers/iio/gyro/adis16080.c @@ -228,7 +228,6 @@ error_ret: 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/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig index a439e0512d5a..658b3673d056 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 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/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile index 79bef4ef7a54..ef3316171299 100644 --- a/drivers/staging/iio/gyro/Makefile +++ b/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 |