staging:iio:accel:sca3000 Move out of staging.

Now the driver is in a reasonable state, lets get it (finally) out
of staging.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 878e3c9..c6cc2c0 100644 (file)
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -303,6 +303,18 @@ config MXC6255
          To compile this driver as a module, choose M here: the module will be
          called mxc6255.
 
+config SCA3000
+       select IIO_BUFFER
+       select IIO_KFIFO_BUF
+       depends on SPI
+       tristate "VTI SCA3000 series accelerometers"
+       help
+         Say Y here to build support for the VTI SCA3000 series of SPI
+         accelerometers. These devices use a hardware ring buffer.
+
+         To compile this driver as a module, say M here: the module will be
+         called sca3000.
+
 config STK8312
        tristate "Sensortek STK8312 3-Axis Accelerometer Driver"
        depends on I2C

diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index 0aa5749..69fe8ed 100644 (file)
--- a/drivers/iio/accel/Makefile
+++ b/drivers/iio/accel/Makefile
@@ -35,6 +35,8 @@ obj-$(CONFIG_MMA9553)         += mma9553.o
 obj-$(CONFIG_MXC4005)          += mxc4005.o
 obj-$(CONFIG_MXC6255)          += mxc6255.o
 
+obj-$(CONFIG_SCA3000)          += sca3000.o
+
 obj-$(CONFIG_STK8312)          += stk8312.o
 obj-$(CONFIG_STK8BA50)         += stk8ba50.o
 

diff --git a/drivers/staging/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
similarity index 100%
rename from drivers/staging/iio/accel/sca3000.c
rename to drivers/iio/accel/sca3000.c

diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index 53389bf..c6b0f5e 100644 (file)
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -51,15 +51,4 @@ config ADIS16240
          To compile this driver as a module, say M here: the module will be
          called adis16240.
 
-config SCA3000
-       select IIO_BUFFER
-       select IIO_KFIFO_BUF
-       depends on SPI
-       tristate "VTI SCA3000 series accelerometers"
-       help
-         Say Y here to build support for the VTI SCA3000 series of SPI
-         accelerometers. These devices use a hardware ring buffer.
-
-         To compile this driver as a module, say M here: the module will be
-         called sca3000.
 endmenu

diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
index 1d49b6a..febb137 100644 (file)
--- a/drivers/staging/iio/accel/Makefile
+++ b/drivers/staging/iio/accel/Makefile
@@ -13,5 +13,3 @@ obj-$(CONFIG_ADIS16209) += adis16209.o
 
 adis16240-y             := adis16240_core.o
 obj-$(CONFIG_ADIS16240) += adis16240.o
-
-obj-$(CONFIG_SCA3000)  += sca3000.o