diff options
author | Len Brown <len.brown@intel.com> | 2009-12-16 04:35:31 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-12-16 04:35:31 +0100 |
commit | 6cbef9fd7c7fa105ad758dc342cc0a14f413fa07 (patch) | |
tree | 93c1b6d7e54b76fc6a43892973c90956268eabf9 /drivers/misc | |
parent | Merge branch 'bugzilla-14700' into release (diff) | |
parent | dell-laptop: remove duplicate Kconfig entry under drivers/misc (diff) | |
download | linux-6cbef9fd7c7fa105ad758dc342cc0a14f413fa07.tar.xz linux-6cbef9fd7c7fa105ad758dc342cc0a14f413fa07.zip |
Merge branch 'dell-laptop' into release
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/Kconfig | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 59f4ba1b7034..1a7a9fc50ea1 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -248,19 +248,6 @@ config SGI_GRU_DEBUG This option enables addition debugging code for the SGI GRU driver. If you are unsure, say N. -config DELL_LAPTOP - tristate "Dell Laptop Extras (EXPERIMENTAL)" - depends on X86 - depends on DCDBAS - depends on EXPERIMENTAL - depends on BACKLIGHT_CLASS_DEVICE - depends on RFKILL - depends on POWER_SUPPLY - default n - ---help--- - This driver adds support for rfkill and backlight control to Dell - laptops. - config ISL29003 tristate "Intersil ISL29003 ambient light sensor" depends on I2C && SYSFS |