patch-2.1.101 linux/drivers/scsi/aic7xxx.c

• Lines: 46
• Date: Fri May 8 00:22:11 1998
• Orig file: v2.1.100/linux/drivers/scsi/aic7xxx.c
• Orig date: Tue Apr 14 14:29:21 1998

diff -u --recursive --new-file v2.1.100/linux/drivers/scsi/aic7xxx.c linux/drivers/scsi/aic7xxx.c
@@ -242,7 +242,7 @@
 #  include <linux/bios32.h>
 #endif
 
-#if !defined(__alpha__)
+#if !defined(__alpha__) && !defined(__sparc__)
 #  define MMAPIO
 #endif
 
@@ -950,10 +950,10 @@
   unsigned short           needwdtr_copy;    /* default config */
   unsigned short           ultraenb;         /* Ultra mode target list */
   unsigned short           bios_control;     /* bios control - SEEPROM */
+  unsigned int             irq;              /* IRQ for this adapter */
   unsigned short           adapter_control;  /* adapter control - SEEPROM */
   unsigned char            pci_bus;
   unsigned char            pci_device_fn;
-  unsigned char            irq;              /* IRQ for this adapter */
 
 #ifdef AIC7XXX_PROC_STATS
   /*
@@ -5245,6 +5245,7 @@
   }
 }
 
+#if defined(__i386__) || defined(__alpha__)
 /*+F*************************************************************************
  * Function:
  *   aic7xxx_probe
@@ -5322,6 +5323,7 @@
 
   return (AHC_NONE);
 }
+#endif /* __i386__ || __alpha__ */
 
 /*+F*************************************************************************
  * Function:
@@ -7266,7 +7268,7 @@
     unsigned short command;
     unsigned int  devconfig, i;
 #ifdef MMAPIO
-    unsigned long page_offset;
+    unsigned long page_offset, base;
 #endif
     struct aic7xxx_host *first_7895 = NULL;
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,1,92)