diff options
| author | Len Brown <len.brown@intel.com> | 2009-08-02 11:34:24 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-08-02 11:34:24 -0400 |
| commit | f63440eff06265fc56e73044f8727b12641b33f1 (patch) | |
| tree | 0923c8f1ef07f175c0ea144b4e6d0eae952c3b3b /drivers/platform/x86/Kconfig | |
| parent | 437f8c8ab99e7b6eed8e0d6d9cf46085c8de2e36 (diff) | |
| parent | 59fe4fe34d7afdf63208124f313be9056feaa2f4 (diff) | |
Merge branch 'thinkpad' into release
Diffstat (limited to 'drivers/platform/x86/Kconfig')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 46dad12f952..77c6097ced8 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -277,31 +277,6 @@ config THINKPAD_ACPI_UNSAFE_LEDS Say N here, unless you are building a kernel for your own use, and need to control the important firmware LEDs. -config THINKPAD_ACPI_DOCK - bool "Legacy Docking Station Support" - depends on THINKPAD_ACPI - depends on ACPI_DOCK=n - default n - ---help--- - Allows the thinkpad_acpi driver to handle docking station events. - This support was made obsolete by the generic ACPI docking station - support (CONFIG_ACPI_DOCK). It will allow locking and removing the - laptop from the docking station, but will not properly connect PCI - devices. - - If you are not sure, say N here. - -config THINKPAD_ACPI_BAY - bool "Legacy Removable Bay Support" - depends on THINKPAD_ACPI - default y - ---help--- - Allows the thinkpad_acpi driver to handle removable bays. It will - electrically disable the device in the bay, and also generate - notifications when the bay lever is ejected or inserted. - - If you are not sure, say Y here. - config THINKPAD_ACPI_VIDEO bool "Video output control support" depends on THINKPAD_ACPI |