diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-01-31 09:27:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-02-02 04:27:56 -0500 |
commit | 420b0fcb523b61eefb347317d3956db3249e968d (patch) | |
tree | 48d9a5a4ef4ffbaef92733ed38179efd07e404f7 /drivers | |
parent | 53ac8500ba9badae82b0412d08e1db9f5b21b3d5 (diff) |
staging:iio: Move adxrs450 driver out of staging
The adxrs450 is in a reasonable shape now. It follows the IIO ABI and non of the
standard code checker tools report any issue, so move it out of staging.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/iio/gyro/Kconfig | 10 | ||||
-rw-r--r-- | drivers/iio/gyro/Makefile | 2 | ||||
-rw-r--r-- | drivers/iio/gyro/adxrs450.c (renamed from drivers/staging/iio/gyro/adxrs450.c) | 0 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/Kconfig | 10 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/Makefile | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig index c9f177dd4cc7..51ac6bc791c6 100644 --- a/drivers/iio/gyro/Kconfig +++ b/drivers/iio/gyro/Kconfig | |||
@@ -19,6 +19,16 @@ config ADIS16136 | |||
19 | Say yes here to build support for the Analog Devices ADIS16133, ADIS16135, | 19 | Say yes here to build support for the Analog Devices ADIS16133, ADIS16135, |
20 | ADIS16136 gyroscope devices. | 20 | ADIS16136 gyroscope devices. |
21 | 21 | ||
22 | config ADXRS450 | ||
23 | tristate "Analog Devices ADXRS450/3 Digital Output Gyroscope SPI driver" | ||
24 | depends on SPI | ||
25 | help | ||
26 | Say yes here to build support for Analog Devices ADXRS450 and ADXRS453 | ||
27 | programmable digital output gyroscope. | ||
28 | |||
29 | This driver can also be built as a module. If so, the module | ||
30 | will be called adxrs450. | ||
31 | |||
22 | config HID_SENSOR_GYRO_3D | 32 | config HID_SENSOR_GYRO_3D |
23 | depends on HID_SENSOR_HUB | 33 | depends on HID_SENSOR_HUB |
24 | select IIO_BUFFER | 34 | select IIO_BUFFER |
diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile index 66b517d9468a..eff9bb0119a2 100644 --- a/drivers/iio/gyro/Makefile +++ b/drivers/iio/gyro/Makefile | |||
@@ -4,6 +4,8 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_ADIS16080) += adis16080.o | 5 | obj-$(CONFIG_ADIS16080) += adis16080.o |
6 | obj-$(CONFIG_ADIS16136) += adis16136.o | 6 | obj-$(CONFIG_ADIS16136) += adis16136.o |
7 | obj-$(CONFIG_ADXRS450) += adxrs450.o | ||
8 | |||
7 | obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o | 9 | obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o |
8 | 10 | ||
9 | obj-$(CONFIG_IIO_ST_GYRO_3AXIS) += st_gyro.o | 11 | obj-$(CONFIG_IIO_ST_GYRO_3AXIS) += st_gyro.o |
diff --git a/drivers/staging/iio/gyro/adxrs450.c b/drivers/iio/gyro/adxrs450.c index d9d43831c380..d9d43831c380 100644 --- a/drivers/staging/iio/gyro/adxrs450.c +++ b/drivers/iio/gyro/adxrs450.c | |||
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig index 658b3673d056..836066287192 100644 --- a/drivers/staging/iio/gyro/Kconfig +++ b/drivers/staging/iio/gyro/Kconfig | |||
@@ -29,14 +29,4 @@ config ADIS16260 | |||
29 | This driver can also be built as a module. If so, the module | 29 | This driver can also be built as a module. If so, the module |
30 | will be called adis16260. | 30 | will be called adis16260. |
31 | 31 | ||
32 | config ADXRS450 | ||
33 | tristate "Analog Devices ADXRS450/3 Digital Output Gyroscope SPI driver" | ||
34 | depends on SPI | ||
35 | help | ||
36 | Say yes here to build support for Analog Devices ADXRS450 and ADXRS453 | ||
37 | programmable digital output gyroscope. | ||
38 | |||
39 | This driver can also be built as a module. If so, the module | ||
40 | will be called adxrs450. | ||
41 | |||
42 | endmenu | 32 | endmenu |
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile index 6b4e60ab743f..98e650061a3a 100644 --- a/drivers/staging/iio/gyro/Makefile +++ b/drivers/staging/iio/gyro/Makefile | |||
@@ -10,5 +10,3 @@ obj-$(CONFIG_ADIS16130) += adis16130.o | |||
10 | 10 | ||
11 | adis16260-y := adis16260_core.o | 11 | adis16260-y := adis16260_core.o |
12 | obj-$(CONFIG_ADIS16260) += adis16260.o | 12 | obj-$(CONFIG_ADIS16260) += adis16260.o |
13 | |||
14 | obj-$(CONFIG_ADXRS450) += adxrs450.o | ||