ide: remove CONFIG_IDE_MAX_HWIFS
The benefits of a user settable CONFIG_IDE_MAX_HWIFS have become pretty tiny and are no longer considered worth the trouble of an own option. Simply always #define MAX_HWIFS to 10. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
0e25f71061
commit
c5bfc3757f
|
@ -54,16 +54,6 @@ menuconfig IDE
|
||||||
|
|
||||||
if IDE
|
if IDE
|
||||||
|
|
||||||
config IDE_MAX_HWIFS
|
|
||||||
int "Max IDE interfaces"
|
|
||||||
depends on ALPHA || SUPERH || IA64 || EMBEDDED
|
|
||||||
range 1 10
|
|
||||||
default 4
|
|
||||||
help
|
|
||||||
This is the maximum number of IDE hardware interfaces that will
|
|
||||||
be supported by the driver. Make sure it is at least as high as
|
|
||||||
the number of IDE interfaces in your system.
|
|
||||||
|
|
||||||
config BLK_DEV_IDE
|
config BLK_DEV_IDE
|
||||||
tristate "Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support"
|
tristate "Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support"
|
||||||
---help---
|
---help---
|
||||||
|
|
|
@ -219,18 +219,7 @@ static inline int __ide_default_irq(unsigned long base)
|
||||||
#include <asm-generic/ide_iops.h>
|
#include <asm-generic/ide_iops.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MAX_HWIFS
|
#define MAX_HWIFS 10
|
||||||
#if defined(CONFIG_BLACKFIN) || defined(CONFIG_H8300) || defined(CONFIG_XTENSA)
|
|
||||||
# define MAX_HWIFS 1
|
|
||||||
#else
|
|
||||||
# define MAX_HWIFS 10
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(MAX_HWIFS) || defined(CONFIG_EMBEDDED)
|
|
||||||
#undef MAX_HWIFS
|
|
||||||
#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Currently only m68k, apus and m8xx need it */
|
/* Currently only m68k, apus and m8xx need it */
|
||||||
#ifndef IDE_ARCH_ACK_INTR
|
#ifndef IDE_ARCH_ACK_INTR
|
||||||
|
|
Loading…
Reference in New Issue