Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index 879fcec72dc12e0bdd2726b19b6d77aba1d489b1..b7af3d6582394b6fb2b370479bd2523f21e6281e 100644 (file)
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -21,9 +21,6 @@
 #include <asm/psr.h>
 #endif
 
-#undef  MAX_HWIFS
-#define MAX_HWIFS      2
-
 #define __ide_insl(data_reg, buffer, wcount) \
        __ide_insw(data_reg, buffer, (wcount)<<1)
 #define __ide_outsl(data_reg, buffer, wcount) \