diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:31 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:31 -0500 |
| commit | 6cbef9fd7c7fa105ad758dc342cc0a14f413fa07 (patch) | |
| tree | 93c1b6d7e54b76fc6a43892973c90956268eabf9 /drivers/misc | |
| parent | 0ceafc33affb566434f362c947b2e1a41450dcf9 (diff) | |
| parent | 8c5d30e590593495c5bb8bd4a2519ce1ac909a22 (diff) | |
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 | |||
| 248 | This option enables addition debugging code for the SGI GRU driver. If | 248 | This option enables addition debugging code for the SGI GRU driver. If |
| 249 | you are unsure, say N. | 249 | you are unsure, say N. |
| 250 | 250 | ||
| 251 | config DELL_LAPTOP | ||
| 252 | tristate "Dell Laptop Extras (EXPERIMENTAL)" | ||
| 253 | depends on X86 | ||
| 254 | depends on DCDBAS | ||
| 255 | depends on EXPERIMENTAL | ||
| 256 | depends on BACKLIGHT_CLASS_DEVICE | ||
| 257 | depends on RFKILL | ||
| 258 | depends on POWER_SUPPLY | ||
| 259 | default n | ||
| 260 | ---help--- | ||
| 261 | This driver adds support for rfkill and backlight control to Dell | ||
| 262 | laptops. | ||
| 263 | |||
| 264 | config ISL29003 | 251 | config ISL29003 |
| 265 | tristate "Intersil ISL29003 ambient light sensor" | 252 | tristate "Intersil ISL29003 ambient light sensor" |
| 266 | depends on I2C && SYSFS | 253 | depends on I2C && SYSFS |