diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
commit | f01674e459923c6df540e6c983d37e5fc94d43b8 (patch) | |
tree | 3a92f84ee42a62f6c1b070adcfcf74cd5be0b7a7 /drivers/ide/pci | |
parent | aab8ad9ec81255ee08825bed36b57484052b94ea (diff) |
ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
* Remove obsoleted "idex=noprobe" kernel parameter.
* Remove no longer needed hwif->noprobe quirk from ide_hwif_configure()
and hwif->noprobe checking from cmd640.c.
v2:
* "ide?=noprobe" -> "ide?=ata66" in Documentation/kernel-parameters.txt.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci')
-rw-r--r-- | drivers/ide/pci/cmd640.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c index dbf0fa733b76..a1cfe033a55f 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c | |||
@@ -789,8 +789,7 @@ static int __init cmd640x_init(void) | |||
789 | /* | 789 | /* |
790 | * Try to enable the secondary interface, if not already enabled | 790 | * Try to enable the secondary interface, if not already enabled |
791 | */ | 791 | */ |
792 | if (cmd_hwif1->noprobe || | 792 | if (cmd_hwif1->drives[0].noprobe && cmd_hwif1->drives[1].noprobe) { |
793 | (cmd_hwif1->drives[0].noprobe && cmd_hwif1->drives[1].noprobe)) { | ||
794 | port2 = "not probed"; | 793 | port2 = "not probed"; |
795 | } else { | 794 | } else { |
796 | b = get_cmd640_reg(CNTRL); | 795 | b = get_cmd640_reg(CNTRL); |