diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
commit | f01674e459923c6df540e6c983d37e5fc94d43b8 (patch) | |
tree | 3a92f84ee42a62f6c1b070adcfcf74cd5be0b7a7 /drivers/ide/ide.c | |
parent | aab8ad9ec81255ee08825bed36b57484052b94ea (diff) |
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 690b5ff4d88f..aa809aded87f 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -1131,7 +1131,7 @@ static int __init ide_setup(char *s) | |||
1131 | * (-8, -9, -10) are reserved to ease the hardcoding. | 1131 | * (-8, -9, -10) are reserved to ease the hardcoding. |
1132 | */ | 1132 | */ |
1133 | static const char *ide_words[] = { | 1133 | static const char *ide_words[] = { |
1134 | "noprobe", "serialize", "minus3", "minus4", | 1134 | "minus1", "serialize", "minus3", "minus4", |
1135 | "reset", "minus6", "ata66", "minus8", "minus9", | 1135 | "reset", "minus6", "ata66", "minus8", "minus9", |
1136 | "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb", | 1136 | "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb", |
1137 | "dtc2278", "umc8672", "ali14xx", NULL }; | 1137 | "dtc2278", "umc8672", "ali14xx", NULL }; |
@@ -1218,9 +1218,7 @@ static int __init ide_setup(char *s) | |||
1218 | hwif->serialized = hwif->mate->serialized = 1; | 1218 | hwif->serialized = hwif->mate->serialized = 1; |
1219 | goto obsolete_option; | 1219 | goto obsolete_option; |
1220 | 1220 | ||
1221 | case -1: /* "noprobe" */ | 1221 | case -1: |
1222 | hwif->noprobe = 1; | ||
1223 | goto obsolete_option; | ||
1224 | case 0: | 1222 | case 0: |
1225 | case 1: | 1223 | case 1: |
1226 | case 2: | 1224 | case 2: |