From 6fcce22add821c4a10db92c12b1e62b171fe9438 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sun, 6 Jan 2013 15:10:00 +0000 Subject: [PATCH] --- yaml --- r: 354211 b: refs/heads/master c: 81ca486fe54c799033fac1eb6d93baf64df37ba6 h: refs/heads/master i: 354209: 3a5a09b95c0336e1c4407cca5f00661a25f8ea58 354207: bcdbc1c0727d565eda60da71788c977acbe21986 v: v3 --- [refs] | 2 +- trunk/drivers/iio/accel/Kconfig | 7 +++++++ trunk/drivers/iio/accel/Makefile | 1 + trunk/drivers/{staging => }/iio/accel/kxsd9.c | 0 trunk/drivers/staging/iio/accel/Kconfig | 7 ------- trunk/drivers/staging/iio/accel/Makefile | 2 -- 6 files changed, 9 insertions(+), 10 deletions(-) rename trunk/drivers/{staging => }/iio/accel/kxsd9.c (100%) diff --git a/[refs] b/[refs] index e90b414e87ea..f6b3879e27a4 100644 --- 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 index 05e996fafc9d..d6003531bd63 100644 --- 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 index 5bc6855a973e..4e1c85987d13 100644 --- 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 b/trunk/drivers/iio/accel/kxsd9.c similarity index 100% rename from trunk/drivers/staging/iio/accel/kxsd9.c rename to trunk/drivers/iio/accel/kxsd9.c diff --git a/trunk/drivers/staging/iio/accel/Kconfig b/trunk/drivers/staging/iio/accel/Kconfig index fa772a9fb612..e2e786dc9c7b 100644 --- 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 index 8e7ee0368519..1ed137f1a506 100644 --- 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