iio:accel:kxsd9 move out of staging

This is a very simple driver giving basic access to this part over an
spi bus.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>

5 files changed, 8 insertions, 9 deletions

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 05e996fafc9d..d6003531bd63 100644
--- a/drivers/iio/accel/Kconfig
+++ b/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/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index 5bc6855a973e..4e1c85987d13 100644
--- a/drivers/iio/accel/Makefile
+++ b/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/drivers/staging/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 4a24c2ee81a9..4a24c2ee81a9 100644
--- a/drivers/staging/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index fa772a9fb612..e2e786dc9c7b 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/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/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
index 8e7ee0368519..1ed137f1a506 100644
--- a/drivers/staging/iio/accel/Makefile
+++ b/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