diff options
| author | Greg Kroah-Hartman | 2016-09-05 08:09:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-09-05 08:09:04 +0200 |
| commit | 2f5bb02ff22414ce156cacb163dd594b017af357 (patch) | |
| tree | 5213feb307367fdffb993ed03ed3094ec92021ea /drivers/misc/Kconfig | |
| parent | device core: Remove deprecated create_singlethread_workqueue (diff) | |
| parent | Linux 4.8-rc5 (diff) | |
| download | kernel-qcow2-linux-2f5bb02ff22414ce156cacb163dd594b017af357.tar.gz kernel-qcow2-linux-2f5bb02ff22414ce156cacb163dd594b017af357.tar.xz kernel-qcow2-linux-2f5bb02ff22414ce156cacb163dd594b017af357.zip | |
Merge 4.8-rc5 into driver-core-next
We want the sysfs and kernfs in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index a216b4667742..d00252828966 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -345,16 +345,6 @@ config SENSORS_TSL2550 This driver can also be built as a module. If so, the module will be called tsl2550. -config SENSORS_BH1780 - tristate "ROHM BH1780GLI ambient light sensor" - depends on I2C && SYSFS - help - If you say yes here you get support for the ROHM BH1780GLI - ambient light sensor. - - This driver can also be built as a module. If so, the module - will be called bh1780gli. - config SENSORS_BH1770 tristate "BH1770GLC / SFH7770 combined ALS - Proximity sensor" depends on I2C |