diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-27 09:38:24 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-27 09:38:24 -0400 |
commit | 9dd4cf1fb949f6ba56b67078c09ef1b78f3c9421 (patch) | |
tree | 73a76dd2b393eed5b36a0ad3b6e590cf9508eff8 /drivers/ide/ide.c | |
parent | 9fd91d959f1a19d1bfa46d97cbbbb55641ce26a6 (diff) |
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>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 9 |
1 files changed, 2 insertions, 7 deletions
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: |