Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

[linux-2.6] / drivers / ide / setup-pci.c

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index d9655aeb013b7e2f0a1f6ea17ba68a2e21e4fc40..a8e9e8a69a525a2b3f162b32348c44577ad83125 100644 (file)
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -515,7 +515,7 @@ static int do_ide_setup_pci_device(struct pci_dev *dev,
         * space, place chipset into init-mode, and/or preserve
         * an interrupt if the card is not native ide support.
         */
-       ret = d->init_chipset ? d->init_chipset(dev, d->name) : 0;
+       ret = d->init_chipset ? d->init_chipset(dev) : 0;
        if (ret < 0)
                goto out;