---

yaml --- r: 354400 b: refs/heads/master c: 420b0fc h: refs/heads/master v: v3
git-mirror · Feb 2, 2013 · 6e40b7f · 6e40b7f
1 parent 101ae50
commit 6e40b7f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53ac8500ba9badae82b0412d08e1db9f5b21b3d5
+refs/heads/master: 420b0fcb523b61eefb347317d3956db3249e968d
diff --git a/trunk/drivers/iio/gyro/Kconfig b/trunk/drivers/iio/gyro/Kconfig
@@ -19,6 +19,16 @@ config ADIS16136
 	  Say yes here to build support for the Analog Devices ADIS16133, ADIS16135,
 	  ADIS16136 gyroscope devices.
 
+config ADXRS450
+	tristate "Analog Devices ADXRS450/3 Digital Output Gyroscope SPI driver"
+	depends on SPI
+	help
+	  Say yes here to build support for Analog Devices ADXRS450 and ADXRS453
+	  programmable digital output gyroscope.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called adxrs450.
+
 config HID_SENSOR_GYRO_3D
 	depends on HID_SENSOR_HUB
 	select IIO_BUFFER

diff --git a/trunk/drivers/iio/gyro/Makefile b/trunk/drivers/iio/gyro/Makefile
@@ -4,6 +4,8 @@
 
 obj-$(CONFIG_ADIS16080) += adis16080.o
 obj-$(CONFIG_ADIS16136) += adis16136.o
+obj-$(CONFIG_ADXRS450) += adxrs450.o
+
 obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o
 
 obj-$(CONFIG_IIO_ST_GYRO_3AXIS) += st_gyro.o

diff --git a/trunk/drivers/staging/iio/gyro/adxrs450.c → trunk/drivers/iio/gyro/adxrs450.c b/trunk/drivers/staging/iio/gyro/adxrs450.c → trunk/drivers/iio/gyro/adxrs450.c
diff --git a/trunk/drivers/staging/iio/gyro/Kconfig b/trunk/drivers/staging/iio/gyro/Kconfig
@@ -29,14 +29,4 @@ config ADIS16260
 	  This driver can also be built as a module.  If so, the module
 	  will be called adis16260.
 
-config ADXRS450
-	tristate "Analog Devices ADXRS450/3 Digital Output Gyroscope SPI driver"
-	depends on SPI
-	help
-	  Say yes here to build support for Analog Devices ADXRS450 and ADXRS453
-	  programmable digital output gyroscope.
-
-	  This driver can also be built as a module.  If so, the module
-	  will be called adxrs450.
-
 endmenu
diff --git a/trunk/drivers/staging/iio/gyro/Makefile b/trunk/drivers/staging/iio/gyro/Makefile
@@ -10,5 +10,3 @@ obj-$(CONFIG_ADIS16130) += adis16130.o
 
 adis16260-y             := adis16260_core.o
 obj-$(CONFIG_ADIS16260) += adis16260.o
-
-obj-$(CONFIG_ADXRS450) += adxrs450.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,5 +10,3 @@ obj-$(CONFIG_ADIS16130) += adis16130.o

		adis16260-y := adis16260_core.o
		obj-$(CONFIG_ADIS16260) += adis16260.o

		obj-$(CONFIG_ADXRS450) += adxrs450.o