Skip to content

Commit

Permalink
ide: remove CONFIG_IDE_MAX_HWIFS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Bartlomiej Zolnierkiewicz committed Aug 5, 2008
1 parent 0e25f71 commit c5bfc37
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
10 changes: 0 additions & 10 deletions drivers/ide/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@ menuconfig 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
tristate "Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support"
---help---
Expand Down
13 changes: 1 addition & 12 deletions include/linux/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,7 @@ static inline int __ide_default_irq(unsigned long base)
#include <asm-generic/ide_iops.h>
#endif

#ifndef MAX_HWIFS
#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
#define MAX_HWIFS 10

/* Currently only m68k, apus and m8xx need it */
#ifndef IDE_ARCH_ACK_INTR
Expand Down

0 comments on commit c5bfc37

Please sign in to comment.