diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 15:33:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 15:33:19 -0500 |
| commit | 288f02bbb6e9609cbaf1eb7a9cb97ae45ce090b2 (patch) | |
| tree | 4f5e5c9fe6638bdbd246379f64b3541de68f329a /drivers/misc | |
| parent | 8aedf8a6ae98d5d4df3254b6afb7e4432d9d8600 (diff) | |
| parent | aa96ce0af8385415a3450bc13e6254a4d6b4a888 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (117 commits)
ACPI processor: Fix section mismatch for processor_add()
ACPI: Add platform-wide _OSC support.
ACPI: cleanup pci_root _OSC code.
ACPI: Add a generic API for _OSC -v2
msi-wmi: depend on backlight and fix corner-cases problems
msi-wmi: switch to using input sparse keymap library
msi-wmi: replace one-condition switch-case with if statement
msi-wmi: remove unused field 'instance' in key_entry structure
msi-wmi: remove custom runtime debug implementation
msi-wmi: rework init
msi-wmi: remove useless includes
X86 drivers: Introduce msi-wmi driver
Toshiba Bluetooth Enabling driver (RFKill handler v3)
ACPI: fix for lapic_timer_propagate_broadcast()
acpi_pad: squish warning
ACPI: dock: minor whitespace and style cleanups
ACPI: dock: add struct dock_station * directly to platform device data
ACPI: dock: dock_add - hoist up platform_device_register_simple()
ACPI: dock: remove global 'dock_device_name'
ACPI: dock: combine add|alloc_dock_dependent_device (v2)
...
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 |