summaryrefslogtreecommitdiff
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-27 15:38:24 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-27 15:38:24 +0200
commite460a59751a7e53b549c63d4d308ba73582c8def (patch)
treea3a7821e22ab13f118203df7415052304a23487a /drivers/ide/ide.c
parent9dd4cf1fb949f6ba56b67078c09ef1b78f3c9421 (diff)
ide: remove obsoleted "idex=reset" kernel parameter
Remove obsoleted "idex=reset" kernel parameter (it has been obsoleted since 1 Nov 2004). Then remove corresponding code from ide_probe_port() and no longer used ->reset field from ide_hwif_t. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r--drivers/ide/ide.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3cac96f3b0aa..7ccf99a11fb6 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -996,7 +996,7 @@ static int __init ide_setup(char *s)
*/
static const char *ide_words[] = {
"minus1", "minus2", "minus3", "minus4",
- "reset", "minus6", "ata66", "minus8", "minus9",
+ "minus5", "minus6", "ata66", "minus8", "minus9",
"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
"dtc2278", "umc8672", "ali14xx", NULL };
@@ -1073,9 +1073,7 @@ static int __init ide_setup(char *s)
#else
goto bad_hwif;
#endif
- case -5: /* "reset" */
- hwif->reset = 1;
- goto obsolete_option;
+ case -5:
case -2:
case -1:
case 0: