Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / include / asm-arm / ide.h

diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h
index d43dee1..b2b9b3d 100644 (file)
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -21,13 +21,6 @@
 # include <asm/arch/ide.h>     /* obsolete + broken */
 #endif
 
-/*
- * We always use the new IDE port registering,
- * so these are fixed here.
- */
-#define ide_default_io_base(i)         (0)
-#define ide_default_irq(b)             (0)
-
 #if !defined(CONFIG_ARCH_L7200) && !defined(CONFIG_ARCH_LH7A40X)
 # define IDE_ARCH_OBSOLETE_INIT
 # ifdef CONFIG_ARCH_CLPS7500
@@ -37,8 +30,6 @@
 # endif
 #endif /* !ARCH_L7200 && !ARCH_LH7A40X */
 
-#define ide_init_default_irq(base)     (0)
-
 #define __ide_mm_insw(port,addr,len)   readsw(port,addr,len)
 #define __ide_mm_insl(port,addr,len)   readsl(port,addr,len)
 #define __ide_mm_outsw(port,addr,len)  writesw(port,addr,len)