patch-2.3.13 linux/drivers/scsi/megaraid.c

Next file: linux/drivers/scsi/pas16.c
Previous file: linux/drivers/scsi/inia100.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/drivers/scsi/megaraid.c linux/drivers/scsi/megaraid.c
@@ -1267,17 +1267,8 @@
 	    PCI_FUNC (pciDevFun));
 
     /* Read the base port and IRQ from PCI */
-#if LINUX_VERSION_CODE < 0x20100
-    pcibios_read_config_dword (pciBus, pciDevFun,
-			       PCI_BASE_ADDRESS_0,
-			       (u_int *) & megaBase);
-    pcibios_read_config_byte (pciBus, pciDevFun,
-			      PCI_INTERRUPT_LINE,
-			      &megaIrq);
-#else
-    megaBase = pdev->base_address[0];
+    megaBase = pdev->resource[0].start;
     megaIrq  = pdev->irq;
-#endif
     pciIdx++;
 
     if (flag & BOARD_QUARTZ) {

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