diff --git a/[refs] b/[refs] index fa2e622c0be3..0efaf1ba8271 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ace08c3c4403140e5ce82116c8f2acb38f58f61d +refs/heads/master: eca1b592d600bb2b7d24b66e4106de1e751ae510 diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c index bde24583bcfc..6d524391e994 100644 --- a/trunk/drivers/char/cyclades.c +++ b/trunk/drivers/char/cyclades.c @@ -4932,8 +4932,6 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr, cy_writel(&ctl_addr->intr_ctrl_stat, readl(&ctl_addr->intr_ctrl_stat) | 0x00030800UL); - plx_init(pdev, irq, ctl_addr); - return 0; err_rel: release_firmware(fw);