Merge commit 'v2.6.27-rc3' into x86/urgent

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

diff --git a/include/asm-parisc/ide.h b/include/asm-parisc/ide.h
index b27bf7aeb2564697325a3509cee430e9a39a61de..c246ef75017db7fc048699577c0603121bb19f51 100644 (file)
--- a/include/asm-parisc/ide.h
+++ b/include/asm-parisc/ide.h
@@ -13,13 +13,6 @@
 
 #ifdef __KERNEL__
 
-#ifndef MAX_HWIFS
-#define MAX_HWIFS      2
-#endif
-
-#define IDE_ARCH_OBSOLETE_INIT
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
 #define ide_request_irq(irq,hand,flg,dev,id)   request_irq((irq),(hand),(flg),(dev),(id))
 #define ide_free_irq(irq,dev_id)               free_irq((irq), (dev_id))
 #define ide_request_region(from,extent,name)   request_region((from), (extent), (name))