ide: remove obsoleted "idex=serialize" kernel parameter

Remove obsoleted "idex=serialize" kernel parameter
(it has been obsoleted since 1 Nov 2004).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.txt
index 829a618c3e93e216792b6bc42e5f471092ac5b91..8209033d2a7fc2581e50498311ea5b0368b8699d 100644 (file)
--- a/Documentation/ide/ide.txt
+++ b/Documentation/ide/ide.txt
@@ -217,11 +217,6 @@ Summary of ide driver parameters for kernel command line
                          As for VLB, it is safest to not specify it.
                          Bigger values are safer than smaller ones.
 
                          As for VLB, it is safest to not specify it.
                          Bigger values are safer than smaller ones.
 

- "idex=serialize"      : do not overlap operations on idex. Please note
-                         that you will have to specify this option for
-                         both the respective primary and secondary channel
-                         to take effect.
-

  "idex=reset"          : reset interface after probe
 
  "ide=doubler"         : probe/support IDE doublers on Amiga
  "idex=reset"          : reset interface after probe
 
  "ide=doubler"         : probe/support IDE doublers on Amiga

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 6cd112cc4af361a7d90287d7d9cbb15720a48275..3cac96f3b0aa02e51a2c7be7b41311d015a03131 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -995,7 +995,7 @@ static int __init ide_setup(char *s)
                 * (-8, -9, -10) are reserved to ease the hardcoding.
                 */
                static const char *ide_words[] = {
                 * (-8, -9, -10) are reserved to ease the hardcoding.
                 */
                static const char *ide_words[] = {

-                       "minus1", "serialize", "minus3", "minus4",
+                       "minus1", "minus2", "minus3", "minus4",

                        "reset", "minus6", "ata66", "minus8", "minus9",
                        "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
                        "dtc2278", "umc8672", "ali14xx", NULL };
                        "reset", "minus6", "ata66", "minus8", "minus9",
                        "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
                        "dtc2278", "umc8672", "ali14xx", NULL };


@@ -1076,12 +1076,7 @@ static int __init ide_setup(char *s)
                        case -5: /* "reset" */
                                hwif->reset = 1;
                                goto obsolete_option;
                        case -5: /* "reset" */
                                hwif->reset = 1;
                                goto obsolete_option;

-                       case -2: /* "serialize" */
-                               hwif->mate = &ide_hwifs[hw^1];
-                               hwif->mate->mate = hwif;
-                               hwif->serialized = hwif->mate->serialized = 1;
-                               goto obsolete_option;
-
+                       case -2:

                        case -1:
                        case 0:
                        case 1:
                        case -1:
                        case 0:
                        case 1: