diff options
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index a33840d11770..8eb7f83b0dda 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -900,7 +900,7 @@ static int __init ide_setup(char *s) | |||
900 | if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) { | 900 | if (s[0] == 'h' && s[1] == 'd' && s[2] >= 'a' && s[2] <= max_drive) { |
901 | const char *hd_words[] = { | 901 | const char *hd_words[] = { |
902 | "none", "noprobe", "nowerr", "cdrom", "nodma", | 902 | "none", "noprobe", "nowerr", "cdrom", "nodma", |
903 | "autotune", "noautotune", "-8", "-9", "-10", | 903 | "autotune", "-7", "-8", "-9", "-10", |
904 | "noflush", "remap", "remap63", "scsi", NULL }; | 904 | "noflush", "remap", "remap63", "scsi", NULL }; |
905 | unit = s[2] - 'a'; | 905 | unit = s[2] - 'a'; |
906 | hw = unit / MAX_DRIVES; | 906 | hw = unit / MAX_DRIVES; |
@@ -929,10 +929,7 @@ static int __init ide_setup(char *s) | |||
929 | drive->nodma = 1; | 929 | drive->nodma = 1; |
930 | goto done; | 930 | goto done; |
931 | case -6: /* "autotune" */ | 931 | case -6: /* "autotune" */ |
932 | drive->autotune = IDE_TUNE_AUTO; | 932 | drive->autotune = 1; |
933 | goto obsolete_option; | ||
934 | case -7: /* "noautotune" */ | ||
935 | drive->autotune = IDE_TUNE_NOAUTO; | ||
936 | goto obsolete_option; | 933 | goto obsolete_option; |
937 | case -11: /* noflush */ | 934 | case -11: /* noflush */ |
938 | drive->noflush = 1; | 935 | drive->noflush = 1; |