diff options
| -rw-r--r-- | drivers/ide/Kconfig | 4 | ||||
| -rw-r--r-- | include/asm-ia64/ide.h | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 1c81174595b3..b26212a4ecf8 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -52,9 +52,9 @@ config IDE | |||
| 52 | 52 | ||
| 53 | if IDE | 53 | if IDE |
| 54 | 54 | ||
| 55 | config IDE_MAX_HWIFS | 55 | config IDE_MAX_HWIFS |
| 56 | int "Max IDE interfaces" | 56 | int "Max IDE interfaces" |
| 57 | depends on ALPHA || SUPERH | 57 | depends on ALPHA || SUPERH || IA64 |
| 58 | default 4 | 58 | default 4 |
| 59 | help | 59 | help |
| 60 | This is the maximum number of IDE hardware interfaces that will | 60 | This is the maximum number of IDE hardware interfaces that will |
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h index e62b95301d51..93f45c5f189f 100644 --- a/include/asm-ia64/ide.h +++ b/include/asm-ia64/ide.h | |||
| @@ -17,14 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
| 19 | 19 | ||
| 20 | #ifndef MAX_HWIFS | ||
| 21 | # ifdef CONFIG_PCI | ||
| 22 | #define MAX_HWIFS 10 | ||
| 23 | # else | ||
| 24 | #define MAX_HWIFS 6 | ||
| 25 | # endif | ||
| 26 | #endif | ||
| 27 | |||
| 28 | #define IDE_ARCH_OBSOLETE_DEFAULTS | 20 | #define IDE_ARCH_OBSOLETE_DEFAULTS |
| 29 | 21 | ||
| 30 | static inline int ide_default_irq(unsigned long base) | 22 | static inline int ide_default_irq(unsigned long base) |
