diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 16:27:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 16:27:36 -0500 |
| commit | 9f9cba810f36d16f4e64477e879a69f6c47b389d (patch) | |
| tree | d787abcbead1439d3f82f0719efe520fd9689f79 /drivers/iio/accel/Kconfig | |
| parent | dbf5bef8da169b38db804996a661f8d634df8295 (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge 3.8-rc5 into tty-next
This resolves a number of tty driver merge issues found in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/accel/Kconfig')
| -rw-r--r-- | drivers/iio/accel/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index fe4bcd7c5b12..05e996fafc9d 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig | |||
| @@ -8,6 +8,7 @@ config HID_SENSOR_ACCEL_3D | |||
| 8 | select IIO_BUFFER | 8 | select IIO_BUFFER |
| 9 | select IIO_TRIGGERED_BUFFER | 9 | select IIO_TRIGGERED_BUFFER |
| 10 | select HID_SENSOR_IIO_COMMON | 10 | select HID_SENSOR_IIO_COMMON |
| 11 | select HID_SENSOR_IIO_TRIGGER | ||
| 11 | tristate "HID Accelerometers 3D" | 12 | tristate "HID Accelerometers 3D" |
| 12 | help | 13 | help |
| 13 | Say yes here to build support for the HID SENSOR | 14 | Say yes here to build support for the HID SENSOR |