summaryrefslogtreecommitdiff
path: root/drivers/iio/light
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 01:24:58 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 01:24:58 +0400
commit55ef003e4ae684d5660f984eb2352df12572d9df (patch)
treec22f2098485b1f373b52e6d253df5a521a5287bb /drivers/iio/light
parent559c71fe5dc3bf2ecc55afb336145db7f0abf810 (diff)
parent419a4aaeb0f7a96359f7e937201b004f23e61976 (diff)
downloadlinux-55ef003e4ae684d5660f984eb2352df12572d9df.tar.xz
Merge tag 'iio-fixes-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes: Second round of IIO fixes for the 3.13 cycle. 2 fixes here. * The gp2ap020a00f is a simple missing kconfig dependency. * The hid sensors hub fix is a work around for an issue introduced by hardware changes due to a certain large software vendor having an 'interesting' interpretation of the specification and hence indexing some arrays from 1 rather than 0. The fix takes advantage of the logical min and max reading facilities introduced by the precursor patch to figure out whether we have a 0 indexed or 1 indexed device and to adjust appropriately. It also drops a previous kconfig option that allowed this issue to be worked around at build time.
Diffstat (limited to 'drivers/iio/light')
-rw-r--r--drivers/iio/light/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index b0d65df3ede2..a022f27c6690 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -43,6 +43,7 @@ config GP2AP020A00F
depends on I2C
select IIO_BUFFER
select IIO_TRIGGERED_BUFFER
+ select IRQ_WORK
help
Say Y here if you have a Sharp GP2AP020A00F proximity/ALS combo-chip
hooked to an I2C bus.