diff --git a/[refs] b/[refs]
index 04c99725233a..ca37e2cfc984 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3262a8f2bf686ced3a6ce8dee013ddf85511fbb6
+refs/heads/master: 898b054f3eec5921320ae8614b5bdd7b07ea5b43
diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig
index dc1de7224426..f4f632917509 100644
--- a/trunk/drivers/acpi/Kconfig
+++ b/trunk/drivers/acpi/Kconfig
@@ -157,7 +157,7 @@ config ACPI_FAN
 	  applications to perform basic fan control (on, off, status).
 
 config ACPI_DOCK
-	tristate "Dock"
+	bool "Dock"
 	depends on EXPERIMENTAL
 	help
 	  This driver adds support for ACPI controlled docking stations and removable