Merge master.kernel.org:/home/rmk/linux-2.6-serial

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

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 68934a25931f7a7928f5ec1a8133027a8bbbef43..6126afe2738078558e54b8c2f0815294e0b8eb80 100644 (file)
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -15,10 +15,6 @@
 
 #include <linux/config.h>
 
-#ifndef MAX_HWIFS
-#define MAX_HWIFS      CONFIG_IDE_MAX_HWIFS
-#endif
-
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
 static inline int ide_default_irq(unsigned long base)