patch-2.3.13 linux/drivers/scsi/53c7,8xx.c

• Lines: 47
• Date: Mon Aug 9 10:23:09 1999
• Orig file: v2.3.12/linux/drivers/scsi/53c7,8xx.c
• Orig date: Thu May 14 18:48:16 1998

diff -u --recursive --new-file v2.3.12/linux/drivers/scsi/53c7,8xx.c linux/drivers/scsi/53c7,8xx.c
@@ -1198,10 +1198,10 @@
  *
  */
 
-__initfunc(static int 
+static int  __init 
 normal_init (Scsi_Host_Template *tpnt, int board, int chip, 
     u32 base, int io_port, int irq, int dma, int pci_valid, 
-    unsigned char pci_bus, unsigned char pci_device_fn, long long options)) {
+    unsigned char pci_bus, unsigned char pci_device_fn, long long options){
     struct Scsi_Host *instance;
     struct NCR53c7x0_hostdata *hostdata;
     char chip_str[80];
@@ -1411,9 +1411,9 @@
  *
  */
 
-__initfunc(static int 
+static int  __init 
 ncr_pci_init (Scsi_Host_Template *tpnt, int board, int chip, 
-    unsigned char bus, unsigned char device_fn, long long options)) {
+    unsigned char bus, unsigned char device_fn, long long options){
     unsigned short command;
 #ifdef LINUX_1_2
     unsigned long
@@ -1445,8 +1445,8 @@
 		"	 perhaps you specified an incorrect PCI bus, device, or function.\n", error);
 	return -1;
     }
-    io_port = pdev->base_address[0];
-    base = pdev->base_address[1];
+    io_port = pdev->resource[0].start;
+    base = pdev->resource[1].start;
     irq = pdev->irq;
 
     /* If any one ever clones the NCR chips, this will have to change */
@@ -1560,8 +1560,8 @@
  *
  */
 
-__initfunc(int 
-NCR53c7xx_detect(Scsi_Host_Template *tpnt)) {
+int __init 
+NCR53c7xx_detect(Scsi_Host_Template *tpnt){
     int i;
     int current_override;
     int count;			/* Number of boards detected */