diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:21:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:21:22 -0800 |
| commit | 0a528ace2ea013fe60efaf633084b154962bfdbb (patch) | |
| tree | 4e038736f3e5ff9eece35f5c2a8efcbb4487a477 /drivers/ide/Config.in | |
| parent | 8b29e8edf0ed8f63ecb35b16946f222854d74ad0 (diff) | |
v2.4.10.5 -> v2.4.10.6
- various: fix some module exports uncovered by stricter error checking
- Urban Widmark: make smbfs use same error define names as samba and win32
- Greg KH: USB update
- Tom Rini: MPC8xx ppc update
- Matthew Wilcox: rd.c page cache flushing fix
- Richard Gooch: devfs race fix: rwsem for symlinks
- Björn Wesen: Cris arch update
- Nikita Danilov: reiserfs cleanup
- Tim Waugh: parport update
- Peter Rival: update alpha SMP bootup to match wait_init_idle fixes
- Trond Myklebust: lockd/grace period fix
Diffstat (limited to 'drivers/ide/Config.in')
| -rw-r--r-- | drivers/ide/Config.in | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/ide/Config.in b/drivers/ide/Config.in index 6fb2d25281ac..b17e8b01f27f 100644 --- a/drivers/ide/Config.in +++ b/drivers/ide/Config.in @@ -124,6 +124,16 @@ if [ "$CONFIG_BLK_DEV_IDE" != "n" ]; then if [ "$CONFIG_Q40" = "y" ]; then dep_bool ' Q40/Q60 IDE interface support' CONFIG_BLK_DEV_Q40IDE $CONFIG_Q40 fi + if [ "$CONFIG_8xx" = "y" ]; then + dep_bool ' MPC8xx IDE support' CONFIG_BLK_DEV_MPC8xx_IDE $CONFIG_8xx + fi + + if [ "$CONFIG_BLK_DEV_MPC8xx_IDE" = "y" ]; then + choice 'Type of MPC8xx IDE interface' \ + "8xx_PCCARD CONFIG_IDE_8xx_PCCARD \ + 8xx_DIRECT CONFIG_IDE_8xx_DIRECT \ + EXT_DIRECT CONFIG_IDE_EXT_DIRECT" 8xx_PCCARD + fi bool ' Other IDE chipset support' CONFIG_IDE_CHIPSETS if [ "$CONFIG_IDE_CHIPSETS" = "y" ]; then @@ -182,7 +192,8 @@ if [ "$CONFIG_IDE_CHIPSETS" = "y" -o \ "$CONFIG_BLK_DEV_SIS5513" = "y" -o \ "$CONFIG_BLK_DEV_SLC90E66" = "y" -o \ "$CONFIG_BLK_DEV_SL82C105" = "y" -o \ - "$CONFIG_BLK_DEV_VIA82CXXX" = "y" ]; then + "$CONFIG_BLK_DEV_VIA82CXXX" = "y" -o \ + "$CONFIG_BLK_DEV_MPC8xx_IDE" = "y" ]; then define_bool CONFIG_BLK_DEV_IDE_MODES y else define_bool CONFIG_BLK_DEV_IDE_MODES n |