Merge to Fedora kernel-2.6.6-1.422

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

diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index 6e8468f..64d8103 100644 (file)
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -19,21 +19,9 @@
 #undef  MAX_HWIFS
 #define MAX_HWIFS      2
 
-static __inline__ int ide_default_irq(unsigned long base)
-{
-       return 0;
-}
-
-static __inline__ unsigned long ide_default_io_base(int index)
-{
-       return 0;
-}
-
 #define IDE_ARCH_OBSOLETE_INIT
 #define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
 
-#define ide_init_default_irq(base)     (0)
-
 #define __ide_insl(data_reg, buffer, wcount) \
        __ide_insw(data_reg, buffer, (wcount)<<1)
 #define __ide_outsl(data_reg, buffer, wcount) \