diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 18:17:52 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 18:17:52 -0500 |
| commit | 17cb3be61b45d716f6b21a9380925493413ce0ed (patch) | |
| tree | d29ca8bc010a22f358032346d7e7b6887c455e08 /drivers/iio/light | |
| parent | d7f9729f6e06c9613a88a18c4e1fbbdf2f6146fd (diff) | |
| parent | e16a922a27ec352537a8027cadc32dc156534ca5 (diff) | |
Merge branch 'staging-linus' into staging-next
This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.
It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/light')
| -rw-r--r-- | drivers/iio/light/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index 1763c9bcb98a..dbf80abc834f 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig | |||
| @@ -47,6 +47,7 @@ config HID_SENSOR_ALS | |||
| 47 | select IIO_BUFFER | 47 | select IIO_BUFFER |
| 48 | select IIO_TRIGGERED_BUFFER | 48 | select IIO_TRIGGERED_BUFFER |
| 49 | select HID_SENSOR_IIO_COMMON | 49 | select HID_SENSOR_IIO_COMMON |
| 50 | select HID_SENSOR_IIO_TRIGGER | ||
| 50 | tristate "HID ALS" | 51 | tristate "HID ALS" |
| 51 | help | 52 | help |
| 52 | Say yes here to build support for the HID SENSOR | 53 | Say yes here to build support for the HID SENSOR |