---

yaml --- r: 354211 b: refs/heads/master c: 81ca486 h: refs/heads/master i: 354209: 3a5a09b 354207: bcdbc1c v: v3
git-mirror · Jan 26, 2013 · 6fcce22 · 6fcce22
1 parent f79f507
commit 6fcce22
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d526e513c7dd1bb3f9696c7d38634e5ebf5f0919
+refs/heads/master: 81ca486fe54c799033fac1eb6d93baf64df37ba6
diff --git a/trunk/drivers/iio/accel/Kconfig b/trunk/drivers/iio/accel/Kconfig
@@ -14,4 +14,11 @@ config HID_SENSOR_ACCEL_3D
 	  Say yes here to build support for the HID SENSOR
 	  accelerometers 3D.
 
+config KXSD9
+	tristate "Kionix KXSD9 Accelerometer Driver"
+	depends on SPI
+	help
+	  Say yes here to build support for the Kionix KXSD9 accelerometer.
+	  Currently this only supports the device via an SPI interface.
+
 endmenu
diff --git a/trunk/drivers/iio/accel/Makefile b/trunk/drivers/iio/accel/Makefile
@@ -3,3 +3,4 @@
 #
 
 obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
+obj-$(CONFIG_KXSD9)	+= kxsd9.o
diff --git a/trunk/drivers/staging/iio/accel/kxsd9.c → trunk/drivers/iio/accel/kxsd9.c b/trunk/drivers/staging/iio/accel/kxsd9.c → trunk/drivers/iio/accel/kxsd9.c
diff --git a/trunk/drivers/staging/iio/accel/Kconfig b/trunk/drivers/staging/iio/accel/Kconfig
@@ -56,13 +56,6 @@ config ADIS16240
 	  Say yes here to build support for Analog Devices adis16240 programmable
 	  impact Sensor and recorder.
 
-config KXSD9
-	tristate "Kionix KXSD9 Accelerometer Driver"
-	depends on SPI
-	help
-	  Say yes here to build support for the Kionix KXSD9 accelerometer.
-	  Currently this only supports the device via an SPI interface.
-
 config LIS3L02DQ
 	tristate "ST Microelectronics LIS3L02DQ Accelerometer Driver"
 	depends on SPI

diff --git a/trunk/drivers/staging/iio/accel/Makefile b/trunk/drivers/staging/iio/accel/Makefile
@@ -20,8 +20,6 @@ obj-$(CONFIG_ADIS16220) += adis16220.o
 adis16240-y             := adis16240_core.o
 obj-$(CONFIG_ADIS16240) += adis16240.o
 
-obj-$(CONFIG_KXSD9)	+= kxsd9.o
-
 lis3l02dq-y		:= lis3l02dq_core.o
 lis3l02dq-$(CONFIG_IIO_BUFFER) += lis3l02dq_ring.o
 obj-$(CONFIG_LIS3L02DQ)	+= lis3l02dq.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		#

		obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
		obj-$(CONFIG_KXSD9) += kxsd9.o