diff --git a/[refs] b/[refs]
index c9f803d2872d..7830c5c34c36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 887c3cb18865a4f9e0786e5a5b3ef47ff469b956
+refs/heads/master: cbff2fbf55c21f50298b1aef1263b11bf510e35f
diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig
index ce9dead0f499..087a7028ae84 100644
--- a/trunk/drivers/acpi/Kconfig
+++ b/trunk/drivers/acpi/Kconfig
@@ -50,6 +50,7 @@ config ACPI_SLEEP
 config ACPI_PROCFS
 	bool "Deprecated /proc/acpi files"
 	depends on PROC_FS
+	default y
 	---help---
 	  For backwards compatibility, this option allows
 	  deprecated /proc/acpi/ files to exist, even when