diff --git a/[refs] b/[refs]
index f4b84f6071ec..5ab8cf1ec936 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 813409771731d80e6fa94199adf99f2269a4afc0
+refs/heads/master: 721ebe005c3bb9add55b2e462dfc1bcf8efc6b8f
diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig
index 574259476fbf..4875f0149eb4 100644
--- a/trunk/drivers/acpi/Kconfig
+++ b/trunk/drivers/acpi/Kconfig
@@ -71,6 +71,7 @@ config ACPI_PROCFS
 config ACPI_PROC_EVENT
 	bool "Deprecated /proc/acpi/event support"
 	depends on PROC_FS
+	default y
 	---help---
 	  A user-space daemon, acpi, typically read /proc/acpi/event
 	  and handled all ACPI sub-system generated events.
@@ -78,10 +79,13 @@ config ACPI_PROC_EVENT
 	  These events are now delivered to user-space via
 	  either the input layer, or as netlink events.
 
-	  This build option enables the old code for for legacy
+	  This build option enables the old code for legacy
 	  user-space implementation.  After some time, this will
 	  be moved under CONFIG_ACPI_PROCFS, and then deleted.
 
+	  Say Y here to retain the old behaviour.  Say N if your
+	  user-space is newer than kernel 2.6.23 (September 2007).
+
 config ACPI_AC
 	tristate "AC Adapter"
 	depends on X86