|
@@ -1396,7 +1396,7 @@ static int __init ide_setup(char *s)
|
|
|
*/
|
|
|
static const char *ide_words[] = {
|
|
|
"noprobe", "serialize", "minus3", "minus4",
|
|
|
- "reset", "dma", "ata66", "minus8", "minus9",
|
|
|
+ "reset", "minus6", "ata66", "minus8", "minus9",
|
|
|
"minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
|
|
|
"dtc2278", "umc8672", "ali14xx", NULL };
|
|
|
hw = s[3] - '0';
|
|
@@ -1475,6 +1475,7 @@ static int __init ide_setup(char *s)
|
|
|
case -10: /* minus10 */
|
|
|
case -9: /* minus9 */
|
|
|
case -8: /* minus8 */
|
|
|
+ case -6:
|
|
|
case -4:
|
|
|
case -3:
|
|
|
goto bad_option;
|
|
@@ -1489,9 +1490,6 @@ static int __init ide_setup(char *s)
|
|
|
#else
|
|
|
goto bad_hwif;
|
|
|
#endif
|
|
|
- case -6: /* dma */
|
|
|
- hwif->autodma = 1;
|
|
|
- goto obsolete_option;
|
|
|
case -5: /* "reset" */
|
|
|
hwif->reset = 1;
|
|
|
goto obsolete_option;
|