---

yaml --- r: 200796 b: refs/heads/master c: 8954bb0 h: refs/heads/master v: v3
git-mirror · Jul 1, 2010 · 9282ada · 9282ada
1 parent e36a7ef
commit 9282ada
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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