aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:57 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-16 16:29:57 -0400
commit1b5169405e50b98b2bd1e4f86c7706ea24a59193 (patch)
treea9bf4bfe1dd7881d2d73d69ef32d5f450a98754a /drivers/ide
parentc58e79dd44243ec919d789193ffb35a220c54695 (diff)
ide: remove "idex=dma" kernel parameter
It has been obsoleted since 1 Nov 2004, is valid only when used together with "ide=nodma" kernel parameter (which makes no sense) and only for aec62xx, cmd64x, cs5220, generic, hpt366, sl82c105, tc86c001 and triflex host drivers. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-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 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;