From 41f79deb94098bc77e3b206701000e903915e95e Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 24 Jul 2008 22:53:27 +0200
Subject: [PATCH] --- yaml --- r: 105730 b: refs/heads/master c:
 ac32f3238c1d95a6ebea2c312160dbdbd61bf91c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/asm-m32r/ide.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e4c1dce3ba25..e1d00cffba25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0a62817961796f6dcef5f316134d8bc7279bf6e
+refs/heads/master: ac32f3238c1d95a6ebea2c312160dbdbd61bf91c
diff --git a/trunk/include/asm-m32r/ide.h b/trunk/include/asm-m32r/ide.h
index 1e7f6474d130..72798d624221 100644
--- a/trunk/include/asm-m32r/ide.h
+++ b/trunk/include/asm-m32r/ide.h
@@ -52,12 +52,20 @@ static __inline__ int ide_default_irq(unsigned long base)
 static __inline__ unsigned long ide_default_io_base(int index)
 {
 	switch (index) {
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
+	|| defined(CONFIG_PLAT_OPSPUT)
+		case 0:	return 0x1f0;
+#elif defined(CONFIG_PLAT_MAPPI3)
+		case 0:	return 0x1f0;
+		case 1:	return 0x170;
+#else
 		case 0:	return 0x1f0;
 		case 1:	return 0x170;
 		case 2: return 0x1e8;
 		case 3: return 0x168;
 		case 4: return 0x1e0;
 		case 5: return 0x160;
+#endif
 		default:
 			return 0;
 	}