aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
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)
996 */ 996 */
997 static const char *ide_words[] = { 997 static const char *ide_words[] = {
998 "minus1", "minus2", "minus3", "minus4", 998 "minus1", "minus2", "minus3", "minus4",
999 "reset", "minus6", "ata66", "minus8", "minus9", 999 "minus5", "minus6", "ata66", "minus8", "minus9",
1000 "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb", 1000 "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
1001 "dtc2278", "umc8672", "ali14xx", NULL }; 1001 "dtc2278", "umc8672", "ali14xx", NULL };
1002 1002
@@ -1073,9 +1073,7 @@ static int __init ide_setup(char *s)
1073#else 1073#else
1074 goto bad_hwif; 1074 goto bad_hwif;
1075#endif 1075#endif
1076 case -5: /* "reset" */ 1076 case -5:
1077 hwif->reset = 1;
1078 goto obsolete_option;
1079 case -2: 1077 case -2:
1080 case -1: 1078 case -1:
1081 case 0: 1079 case 0: