diff --git a/[refs] b/[refs]
index 1c0774b24e0c..f584a626b501 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 534be1d5a2da940ecc5e528992ea4ace8658157a
+refs/heads/master: 8954bb0da99b76c7ce5edf2f314807cff68b6ea8
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 1f254bd6c937..98922f7d2d12 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -955,7 +955,8 @@ config XSCALE_PMU
 	default y
 
 config CPU_HAS_PMU
-	depends on CPU_V6 || CPU_V7 || XSCALE_PMU
+	depends on (CPU_V6 || CPU_V7 || XSCALE_PMU) && \
+		   (!ARCH_OMAP3 || OMAP3_EMU)
 	default y
 	bool