diff --git a/[refs] b/[refs]
index ea5f299a5760..d45446b0905a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48cdd8287f47a3cdad5b9273a5ef81bf605f7826
+refs/heads/master: 102b208e6b3b16d3611b67a7af9a93d30b92c006
diff --git a/trunk/drivers/xen/Kconfig b/trunk/drivers/xen/Kconfig
index 648bcd4195c5..b1d524aeb3c3 100644
--- a/trunk/drivers/xen/Kconfig
+++ b/trunk/drivers/xen/Kconfig
@@ -181,8 +181,7 @@ config XEN_PRIVCMD
 config XEN_ACPI_PROCESSOR
 	tristate "Xen ACPI processor"
 	depends on XEN && X86 && ACPI_PROCESSOR
-	default y if (X86_ACPI_CPUFREQ = y || X86_POWERNOW_K8 = y)
-	default m if (X86_ACPI_CPUFREQ = m || X86_POWERNOW_K8 = m)
+	default m
 	help
           This ACPI processor uploads Power Management information to the Xen hypervisor.