Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

[pandora-kernel.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f0202ee..9e4f65f 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -321,6 +321,7 @@ config THINKPAD_ACPI_DOCK
        bool "Legacy Docking Station Support"
        depends on THINKPAD_ACPI
        depends on ACPI_DOCK=n
+       depends on BROKEN
        default n
        ---help---
          Allows the thinkpad_acpi driver to handle docking station events.
@@ -334,7 +335,8 @@ config THINKPAD_ACPI_DOCK
 config THINKPAD_ACPI_BAY
        bool "Legacy Removable Bay Support"
        depends on THINKPAD_ACPI
-       default y
+       depends on BROKEN
+       default n
        ---help---
          Allows the thinkpad_acpi driver to handle removable bays.  It will
          electrically disable the device in the bay, and also generate