Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

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

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 6624e54..2a5cc0b 100644 (file)
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -13,11 +13,8 @@
 
 #ifdef __KERNEL__
 
-#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)
 {