---

yaml --- r: 163527 b: refs/heads/master c: 7d9c035 h: refs/heads/master i: 163525: 64d09e6 163523: becba37 163519: d169526 v: v3
git-mirror · Aug 24, 2009 · c749f9e · c749f9e
1 parent c5f5501
commit c749f9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fea966f7564205fcf5919af9bde031e753419c96
+refs/heads/master: 7d9c035150897c2bebedae280505513dbdef2abc
diff --git a/trunk/arch/sh/include/asm/io.h b/trunk/arch/sh/include/asm/io.h
@@ -92,8 +92,12 @@
 
 static inline void ctrl_delay(void)
 {
-#ifdef P2SEG
+#ifdef CONFIG_CPU_SH4
+	__raw_readw(CCN_PVR);
+#elif defined(P2SEG)
 	__raw_readw(P2SEG);
+#else
+#error "Need a dummy address for delay"
 #endif
 }