patch-2.3.13 linux/drivers/block/trm290.c

Next file: linux/drivers/block/via82c586.c
Previous file: linux/drivers/block/sl82c105.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/drivers/block/trm290.c linux/drivers/block/trm290.c
@@ -212,7 +212,7 @@
 /*
  * Invoked from ide-dma.c at boot time.
  */
-__initfunc(void ide_init_trm290 (ide_hwif_t *hwif))
+void __init ide_init_trm290 (ide_hwif_t *hwif)
 {
 	unsigned int cfgbase = 0;
 	unsigned long flags;
@@ -220,7 +220,7 @@
 	struct pci_dev *dev = hwif->pci_dev;
 
 	hwif->chipset = ide_trm290;
-	cfgbase = dev->base_address[4];
+	cfgbase = dev->resource[4].start;
 	if ((dev->class & 5) && cfgbase)
 	{
 		hwif->config_data = cfgbase & PCI_BASE_ADDRESS_IO_MASK;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)