From 889bab4a9fe592fa26d508199b21a242d8d7d473 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 24 Jul 2008 22:53:30 +0200
Subject: [PATCH] --- yaml --- r: 105735 b: refs/heads/master c:
 ffed0b6e1a6f5132681d4b521531d992f893190b h: refs/heads/master i:   105733:
 f7d3f83366149606a20fce1234bc90a5a9b5702d   105731:
 7cf09c9f314a485ed02d07ab887598a0637bb8d9   105727:
 bd744c028a94e53ba633f5b274e7d1a79af5f0f9 v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-powerpc/ide.h | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 3ef93b91510b..108156690fd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d83b8b85cd56a083d30df73f3fd5e4714591b910
+refs/heads/master: ffed0b6e1a6f5132681d4b521531d992f893190b
diff --git a/trunk/include/asm-powerpc/ide.h b/trunk/include/asm-powerpc/ide.h
index 262def6a9f0a..1aaf27be8741 100644
--- a/trunk/include/asm-powerpc/ide.h
+++ b/trunk/include/asm-powerpc/ide.h
@@ -31,16 +31,6 @@ static __inline__ int ide_default_irq(unsigned long base)
 	case 0x1f0:	return 14;
 	case 0x170:	return 15;
 	}
-#endif
-#ifdef CONFIG_PPC_PREP
-	switch (base) {
-	case 0x1f0:	return 13;
-	case 0x170:	return 13;
-	case 0x1e8:	return 11;
-	case 0x168:	return 10;
-	case 0xfff0:	return 14;	/* MCP(N)750 ide0 */
-	case 0xffe0:	return 15;	/* MCP(N)750 ide1 */
-	}
 #endif
 	return 0;
 }
@@ -53,14 +43,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
 	case 0:		return 0x1f0;
 	case 1:		return 0x170;
 	}
-#endif
-#ifdef CONFIG_PPC_PREP
-	switch (index) {
-	case 0:		return 0x1f0;
-	case 1:		return 0x170;
-	case 2:		return 0x1e8;
-	case 3:		return 0x168;
-	}
 #endif
 	return 0;
 }