diff options
-rw-r--r-- | Documentation/ide/ide.txt | 5 | ||||
-rw-r--r-- | drivers/ide/ide.c | 9 |
2 files changed, 2 insertions, 12 deletions
diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.txt index 829a618c3e93..8209033d2a7f 100644 --- a/Documentation/ide/ide.txt +++ b/Documentation/ide/ide.txt | |||
@@ -217,11 +217,6 @@ Summary of ide driver parameters for kernel command line | |||
217 | As for VLB, it is safest to not specify it. | 217 | As for VLB, it is safest to not specify it. |
218 | Bigger values are safer than smaller ones. | 218 | Bigger values are safer than smaller ones. |
219 | 219 | ||
220 | "idex=serialize" : do not overlap operations on idex. Please note | ||
221 | that you will have to specify this option for | ||
222 | both the respective primary and secondary channel | ||
223 | to take effect. | ||
224 | |||
225 | "idex=reset" : reset interface after probe | 220 | "idex=reset" : reset interface after probe |
226 | 221 | ||
227 | "ide=doubler" : probe/support IDE doublers on Amiga | 222 | "ide=doubler" : probe/support IDE doublers on Amiga |
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 6cd112cc4af3..3cac96f3b0aa 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -995,7 +995,7 @@ static int __init ide_setup(char *s) | |||
995 | * (-8, -9, -10) are reserved to ease the hardcoding. | 995 | * (-8, -9, -10) are reserved to ease the hardcoding. |
996 | */ | 996 | */ |
997 | static const char *ide_words[] = { | 997 | static const char *ide_words[] = { |
998 | "minus1", "serialize", "minus3", "minus4", | 998 | "minus1", "minus2", "minus3", "minus4", |
999 | "reset", "minus6", "ata66", "minus8", "minus9", | 999 | "reset", "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 }; |
@@ -1076,12 +1076,7 @@ static int __init ide_setup(char *s) | |||
1076 | case -5: /* "reset" */ | 1076 | case -5: /* "reset" */ |
1077 | hwif->reset = 1; | 1077 | hwif->reset = 1; |
1078 | goto obsolete_option; | 1078 | goto obsolete_option; |
1079 | case -2: /* "serialize" */ | 1079 | case -2: |
1080 | hwif->mate = &ide_hwifs[hw^1]; | ||
1081 | hwif->mate->mate = hwif; | ||
1082 | hwif->serialized = hwif->mate->serialized = 1; | ||
1083 | goto obsolete_option; | ||
1084 | |||
1085 | case -1: | 1080 | case -1: |
1086 | case 0: | 1081 | case 0: |
1087 | case 1: | 1082 | case 1: |