diff --git a/[refs] b/[refs]
index 8c5362906fa2..fd6ab2b076a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38ad9aebe70dc72df08851bbd1620d89329129ba
+refs/heads/master: 7d2284b09fd967b5cad6f03c6d4a5c064f37b855
diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig
index 2a3a7ea5958c..25232ba08119 100644
--- a/trunk/arch/blackfin/Kconfig
+++ b/trunk/arch/blackfin/Kconfig
@@ -65,6 +65,10 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
+config HARDWARE_PM
+	def_bool y
+	depends on OPROFILE
+
 source "init/Kconfig"
 source "kernel/Kconfig.preempt"