diff options
Diffstat (limited to 'drivers/iio/accel')
-rw-r--r-- | drivers/iio/accel/Kconfig | 16 | ||||
-rw-r--r-- | drivers/iio/accel/Makefile | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index a00267525b66..61ca7ec0f3e7 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig | |||
@@ -1,6 +1,8 @@ | |||
1 | # | 1 | # |
2 | # Accelerometer drivers | 2 | # Accelerometer drivers |
3 | # | 3 | # |
4 | # When adding new entries keep the list in alphabetical order | ||
5 | |||
4 | menu "Accelerometers" | 6 | menu "Accelerometers" |
5 | 7 | ||
6 | config HID_SENSOR_ACCEL_3D | 8 | config HID_SENSOR_ACCEL_3D |
@@ -14,13 +16,6 @@ config HID_SENSOR_ACCEL_3D | |||
14 | Say yes here to build support for the HID SENSOR | 16 | Say yes here to build support for the HID SENSOR |
15 | accelerometers 3D. | 17 | accelerometers 3D. |
16 | 18 | ||
17 | config KXSD9 | ||
18 | tristate "Kionix KXSD9 Accelerometer Driver" | ||
19 | depends on SPI | ||
20 | help | ||
21 | Say yes here to build support for the Kionix KXSD9 accelerometer. | ||
22 | Currently this only supports the device via an SPI interface. | ||
23 | |||
24 | config IIO_ST_ACCEL_3AXIS | 19 | config IIO_ST_ACCEL_3AXIS |
25 | tristate "STMicroelectronics accelerometers 3-Axis Driver" | 20 | tristate "STMicroelectronics accelerometers 3-Axis Driver" |
26 | depends on (I2C || SPI_MASTER) && SYSFS | 21 | depends on (I2C || SPI_MASTER) && SYSFS |
@@ -51,4 +46,11 @@ config IIO_ST_ACCEL_SPI_3AXIS | |||
51 | depends on IIO_ST_ACCEL_3AXIS | 46 | depends on IIO_ST_ACCEL_3AXIS |
52 | depends on IIO_ST_SENSORS_SPI | 47 | depends on IIO_ST_SENSORS_SPI |
53 | 48 | ||
49 | config KXSD9 | ||
50 | tristate "Kionix KXSD9 Accelerometer Driver" | ||
51 | depends on SPI | ||
52 | help | ||
53 | Say yes here to build support for the Kionix KXSD9 accelerometer. | ||
54 | Currently this only supports the device via an SPI interface. | ||
55 | |||
54 | endmenu | 56 | endmenu |
diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index 87d8fa264894..2f95a3dffa47 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile | |||
@@ -2,7 +2,9 @@ | |||
2 | # Makefile for industrial I/O accelerometer drivers | 2 | # Makefile for industrial I/O accelerometer drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | # When adding new entries keep the list in alphabetical order | ||
5 | obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o | 6 | obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o |
7 | obj-$(CONFIG_KXSD9) += kxsd9.o | ||
6 | 8 | ||
7 | obj-$(CONFIG_IIO_ST_ACCEL_3AXIS) += st_accel.o | 9 | obj-$(CONFIG_IIO_ST_ACCEL_3AXIS) += st_accel.o |
8 | st_accel-y := st_accel_core.o | 10 | st_accel-y := st_accel_core.o |
@@ -10,5 +12,3 @@ st_accel-$(CONFIG_IIO_BUFFER) += st_accel_buffer.o | |||
10 | 12 | ||
11 | obj-$(CONFIG_IIO_ST_ACCEL_I2C_3AXIS) += st_accel_i2c.o | 13 | obj-$(CONFIG_IIO_ST_ACCEL_I2C_3AXIS) += st_accel_i2c.o |
12 | obj-$(CONFIG_IIO_ST_ACCEL_SPI_3AXIS) += st_accel_spi.o | 14 | obj-$(CONFIG_IIO_ST_ACCEL_SPI_3AXIS) += st_accel_spi.o |
13 | |||
14 | obj-$(CONFIG_KXSD9) += kxsd9.o | ||