diff options
Diffstat (limited to 'drivers/ide')
-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 837822ab6cb1..02336595144a 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -1396,7 +1396,7 @@ static int __init ide_setup(char *s) | |||
1396 | */ | 1396 | */ |
1397 | static const char *ide_words[] = { | 1397 | static const char *ide_words[] = { |
1398 | "noprobe", "serialize", "minus3", "minus4", | 1398 | "noprobe", "serialize", "minus3", "minus4", |
1399 | "reset", "dma", "ata66", "minus8", "minus9", | 1399 | "reset", "minus6", "ata66", "minus8", "minus9", |
1400 | "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb", | 1400 | "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb", |
1401 | "dtc2278", "umc8672", "ali14xx", NULL }; | 1401 | "dtc2278", "umc8672", "ali14xx", NULL }; |
1402 | hw = s[3] - '0'; | 1402 | hw = s[3] - '0'; |
@@ -1475,6 +1475,7 @@ static int __init ide_setup(char *s) | |||
1475 | case -10: /* minus10 */ | 1475 | case -10: /* minus10 */ |
1476 | case -9: /* minus9 */ | 1476 | case -9: /* minus9 */ |
1477 | case -8: /* minus8 */ | 1477 | case -8: /* minus8 */ |
1478 | case -6: | ||
1478 | case -4: | 1479 | case -4: |
1479 | case -3: | 1480 | case -3: |
1480 | goto bad_option; | 1481 | goto bad_option; |
@@ -1489,9 +1490,6 @@ static int __init ide_setup(char *s) | |||
1489 | #else | 1490 | #else |
1490 | goto bad_hwif; | 1491 | goto bad_hwif; |
1491 | #endif | 1492 | #endif |
1492 | case -6: /* dma */ | ||
1493 | hwif->autodma = 1; | ||
1494 | goto obsolete_option; | ||
1495 | case -5: /* "reset" */ | 1493 | case -5: /* "reset" */ |
1496 | hwif->reset = 1; | 1494 | hwif->reset = 1; |
1497 | goto obsolete_option; | 1495 | goto obsolete_option; |