From 5e04b63ba996f1167a4f19a90d414f20eac8371d Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 18 Aug 2008 21:40:03 +0200
Subject: [PATCH] --- yaml --- r: 108742 b: refs/heads/master c:
 1f49060adcc1817337af95392bdf8a6205abffa0 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/powerpc/include/asm/ide.h | 43 +---------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index fdae18bcdab7..28d2df411e5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a69999e286b5da33232694a2ad99c29419b91a44
+refs/heads/master: 1f49060adcc1817337af95392bdf8a6205abffa0
diff --git a/trunk/arch/powerpc/include/asm/ide.h b/trunk/arch/powerpc/include/asm/ide.h
index 048480e340f2..da01b20aea59 100644
--- a/trunk/arch/powerpc/include/asm/ide.h
+++ b/trunk/arch/powerpc/include/asm/ide.h
@@ -6,12 +6,7 @@
 #ifndef _ASM_POWERPC_IDE_H
 #define _ASM_POWERPC_IDE_H
 
-#ifdef __KERNEL__
-
-#ifndef __powerpc64__
-#include <linux/sched.h>
-#include <asm/mpc8xx.h>
-#endif
+#include <linux/compiler.h>
 #include <asm/io.h>
 
 #define __ide_mm_insw(p, a, c)	readsw((void __iomem *)(p), (a), (c))
@@ -19,40 +14,4 @@
 #define __ide_mm_outsw(p, a, c)	writesw((void __iomem *)(p), (a), (c))
 #define __ide_mm_outsl(p, a, c)	writesl((void __iomem *)(p), (a), (c))
 
-#ifndef  __powerpc64__
-#include <linux/ioport.h>
-
-/* FIXME: use ide_platform host driver */
-static __inline__ int ide_default_irq(unsigned long base)
-{
-#ifdef CONFIG_PPLUS
-	switch (base) {
-	case 0x1f0:	return 14;
-	case 0x170:	return 15;
-	}
-#endif
-	return 0;
-}
-
-/* FIXME: use ide_platform host driver */
-static __inline__ unsigned long ide_default_io_base(int index)
-{
-#ifdef CONFIG_PPLUS
-	switch (index) {
-	case 0:		return 0x1f0;
-	case 1:		return 0x170;
-	}
-#endif
-	return 0;
-}
-
-#ifdef CONFIG_BLK_DEV_MPC8xx_IDE
-#define IDE_ARCH_ACK_INTR  1
-#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)
-#endif
-
-#endif /* __powerpc64__ */
-
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_POWERPC_IDE_H */