diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-26 15:50:34 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-26 15:50:34 -0500 |
commit | c53ea18dc29a1ac075119f651d6ac4386a549a34 (patch) | |
tree | cdee13285dec95667f994af67e8852afec5b3c99 /drivers/ide/ide.c | |
parent | cbd34d00af2960097ebd46a31dabc8bb9f16ea4e (diff) |
ide: skip probing port if "hdx=noprobe" was used for both devices on it
* Skip probing port if "hdx=noprobe" parameter was used for both devices on it.
* Obsolete "idex=noprobe" parameter - it only works for ide_generic, cmd640
and PCI hosts in Compatibility mode (on alpha/x86/ia64/m32r/mips/ppc32).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 784d60e376ee..300536697622 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -1444,7 +1444,7 @@ static int __init ide_setup(char *s) | |||
1444 | 1444 | ||
1445 | case -1: /* "noprobe" */ | 1445 | case -1: /* "noprobe" */ |
1446 | hwif->noprobe = 1; | 1446 | hwif->noprobe = 1; |
1447 | goto done; | 1447 | goto obsolete_option; |
1448 | 1448 | ||
1449 | case 1: /* base */ | 1449 | case 1: /* base */ |
1450 | vals[1] = vals[0] + 0x206; /* default ctl */ | 1450 | vals[1] = vals[0] + 0x206; /* default ctl */ |