Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / drivers / ata / pata_netcell.c

diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index e3a85778cd4f1d3411985db6d59413c4bdead110..f5672de99c22d3012bb419e5956e410db3f83f74 100644 (file)
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -24,7 +24,7 @@
  *
  *     Cables are handled by the RAID controller. Report 80 pin.
  */
- 
+
 static int netcell_pre_reset(struct ata_port *ap)
 {
        ap->cbl = ATA_CBL_PATA80;
@@ -90,8 +90,7 @@ static const struct ata_port_operations netcell_ops = {
        .qc_issue               = ata_qc_issue_prot,
        .data_xfer              = ata_pio_data_xfer,
 
-       /* Timeout handling. Special recovery hooks here */
-       .eng_timeout            = ata_eng_timeout,
+       /* IRQ-related hooks */
        .irq_handler            = ata_interrupt,
        .irq_clear              = ata_bmdma_irq_clear,
 
@@ -137,13 +136,14 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e
 
        /* Any chip specific setup/optimisation/messages here */
        ata_pci_clear_simplex(pdev);
-       
+
        /* And let the library code do the work */
        return ata_pci_init_one(pdev, port_info, 2);
 }
 
 static const struct pci_device_id netcell_pci_tbl[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_NETCELL, PCI_DEVICE_ID_REVOLUTION), },
+       { PCI_VDEVICE(NETCELL, PCI_DEVICE_ID_REVOLUTION), },
+
        { }     /* terminate list */
 };