From c749f9e38d2273994e29954a5796a0c18c6f0cc3 Mon Sep 17 00:00:00 2001
From: Stuart Menefy <stuart.menefy@st.com>
Date: Mon, 24 Aug 2009 17:13:52 +0900
Subject: [PATCH] --- yaml --- r: 163527 b: refs/heads/master c:
 7d9c035150897c2bebedae280505513dbdef2abc h: refs/heads/master i:   163525:
 64d09e62e85bccabf34c192b066078496d114dd8   163523:
 becba371156d61988dd569aa2f7a23e4788847b3   163519:
 d169526ac0d852dbdfcf70ecda12bc4e03ce2e54 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sh/include/asm/io.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fcff3dd2572b..ddf9edc3b7b1 100644
--- 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
index aeecf432d48c..5be45ea4dfec 100644
--- 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
 }