[netdrvr] wd: fix build breakage with new NS8390p API

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / ide.h

diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h
index 3d90bf7d3d73ed19ae011c20b576f422b07e5868..1aaf27be8741a3ab9f52a3e538376a38978be779 100644 (file)
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -14,14 +14,6 @@
 #endif
 #include <asm/io.h>
 
-#ifndef MAX_HWIFS
-#ifdef __powerpc64__
-#define MAX_HWIFS      10
-#else
-#define MAX_HWIFS      8
-#endif
-#endif
-
 #define __ide_mm_insw(p, a, c) readsw((void __iomem *)(p), (a), (c))
 #define __ide_mm_insl(p, a, c) readsl((void __iomem *)(p), (a), (c))
 #define __ide_mm_outsw(p, a, c)        writesw((void __iomem *)(p), (a), (c))
@@ -39,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;
 }
@@ -61,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;
 }