summaryrefslogtreecommitdiffstats
path: root/drivers/misc/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-15 22:35:31 -0500
committerLen Brown <len.brown@intel.com>2009-12-15 22:35:31 -0500
commit6cbef9fd7c7fa105ad758dc342cc0a14f413fa07 (patch)
tree93c1b6d7e54b76fc6a43892973c90956268eabf9 /drivers/misc/Kconfig
parent0ceafc33affb566434f362c947b2e1a41450dcf9 (diff)
parent8c5d30e590593495c5bb8bd4a2519ce1ac909a22 (diff)
downloadlinux-6cbef9fd7c7fa105ad758dc342cc0a14f413fa07.tar.gz
linux-6cbef9fd7c7fa105ad758dc342cc0a14f413fa07.tar.bz2
linux-6cbef9fd7c7fa105ad758dc342cc0a14f413fa07.zip
Merge branch 'dell-laptop' into release
Diffstat (limited to 'drivers/misc/Kconfig')
-rw-r--r--drivers/misc/Kconfig13
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