Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / asm-x86 / ide.h

diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
index 58080a7111dec8f285d02af56a2f4517fd91033a..cf9c98e5bdb58a045eaf557f57218fe791d64970 100644 (file)
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -58,14 +58,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
        }
 }
 
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
-#ifdef CONFIG_BLK_DEV_IDEPCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */