diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 22:46:35 (GMT) |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 22:46:35 (GMT) |
commit | f01674e459923c6df540e6c983d37e5fc94d43b8 (patch) | |
tree | 3a92f84ee42a62f6c1b070adcfcf74cd5be0b7a7 /drivers/ide/ide.c | |
parent | aab8ad9ec81255ee08825bed36b57484052b94ea (diff) | |
download | linux-fsl-qoriq-f01674e459923c6df540e6c983d37e5fc94d43b8.tar.xz |
ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
* Remove obsoleted "idex=noprobe" kernel parameter.
* Remove no longer needed hwif->noprobe quirk from ide_hwif_configure()
and hwif->noprobe checking from cmd640.c.
v2:
* "ide?=noprobe" -> "ide?=ata66" in Documentation/kernel-parameters.txt.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 690b5ff4..aa809ad 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -1131,7 +1131,7 @@ static int __init ide_setup(char *s) * (-8, -9, -10) are reserved to ease the hardcoding. */ static const char *ide_words[] = { - "noprobe", "serialize", "minus3", "minus4", + "minus1", "serialize", "minus3", "minus4", "reset", "minus6", "ata66", "minus8", "minus9", "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb", "dtc2278", "umc8672", "ali14xx", NULL }; @@ -1218,9 +1218,7 @@ static int __init ide_setup(char *s) hwif->serialized = hwif->mate->serialized = 1; goto obsolete_option; - case -1: /* "noprobe" */ - hwif->noprobe = 1; - goto obsolete_option; + case -1: case 0: case 1: case 2: |