Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[mv-sheeva.git] / include / asm-m32r / ide.h

diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index feb7f0d7aca92ee6733e31683891c9b5041203b5..1e7f6474d1307578cfa8bb59a80f896a5d06abe8 100644 (file)
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -63,14 +63,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__ */