summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-09-03 11:38:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-03 11:38:43 -0700
commit593ee4edc51d99fadda9f6eea8c0201c59452de7 (patch)
tree7c68d5acf4d372b4a5efe849d19df5c3eb7cd48d /drivers/iio
parent41488202f1afac2e7425cc4d4a3b4208c3e2cc8c (diff)
parentccdf3b888d87df1b914fedde91ed1848f0651c65 (diff)
downloadlinux-593ee4edc51d99fadda9f6eea8c0201c59452de7.tar.bz2
Merge tag 'char-misc-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH: "Here are a number of small driver fixes for 4.8-rc5. The largest thing here is deleting an obsolete driver, drivers/misc/bh1780gli.c, as the functionality of it was replaced by an iio driver a while ago. The other fixes are things that have been reported, or reverts of broken stuff (the binder change). All of these changes have been in linux-next for a while with no reported issues" * tag 'char-misc-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: thunderbolt: Don't declare Falcon Ridge unsupported thunderbolt: Add support for INTEL_FALCON_RIDGE_2C controller. thunderbolt: Fix resume quirk for Falcon Ridge 4C. lkdtm: Mark lkdtm_rodata_do_nothing() notrace mei: me: disable driver on SPT SPS firmware Revert "android: binder: fix dangling pointer comparison" drivers/iio/light/Kconfig: SENSORS_BH1780 cleanup android: binder: fix dangling pointer comparison misc: delete bh1780 driver
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/light/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 12ceb11bc7c5..3574945183fe 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -76,7 +76,6 @@ config BH1750
config BH1780
tristate "ROHM BH1780 ambient light sensor"
depends on I2C
- depends on !SENSORS_BH1780
help
Say Y here to build support for the ROHM BH1780GLI ambient
light sensor.