]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/ide/pci/delkin_cb.c
ide: delete filenames/versions from comments
[linux-2.6-omap-h63xx.git] / drivers / ide / pci / delkin_cb.c
index dd7ec37fdeab2d14ea76e855f7dd57e0961c84b1..27e47fc97100248a05c6232f84eb7b717fee253d 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *  linux/drivers/ide/pci/delkin_cb.c
- *
  *  Created 20 Oct 2004 by Mark Lord
  *
  *  Basic support for Delkin/ASKA/Workbit Cardbus CompactFlash adapter
@@ -80,14 +78,14 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
        hw.irq = dev->irq;
        hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
-       rc = ide_register_hw_with_fixup(&hw, &hwif, ide_undecoded_slave);
+       rc = ide_register_hw(&hw, &ide_undecoded_slave, &hwif);
        if (rc < 0) {
                printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);
                pci_disable_device(dev);
                return -ENODEV;
        }
        pci_set_drvdata(dev, hwif);
-       hwif->pci_dev = dev;
+       hwif->dev = &dev->dev;
        drive = &hwif->drives[0];
        if (drive->present) {
                drive->io_32bit = 1;