---

yaml --- r: 26305 b: refs/heads/master c: 4661e3e h: refs/heads/master i: 26303: 144c379 v: v3
git-mirror · Apr 29, 2006 · e6dd4f8 · e6dd4f8
1 parent 76b49d5
commit e6dd4f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 543f2a3382bd7abd7380903518c61f00c7c87577
+refs/heads/master: 4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
@@ -446,7 +446,9 @@ config SCSI_DPT_I2O
 
 config SCSI_ADVANSYS
 	tristate "AdvanSys SCSI support"
-	depends on (ISA || EISA || PCI) && SCSI && BROKEN
+	depends on SCSI
+	depends on ISA || EISA || PCI
+	depends on BROKEN || X86_32
 	help
 	  This is a driver for all SCSI host adapters manufactured by
 	  AdvanSys. It is documented in the kernel source in

diff --git a/trunk/drivers/scsi/advansys.c b/trunk/drivers/scsi/advansys.c
@@ -2051,7 +2051,7 @@ STATIC ASC_DCNT  AscGetMaxDmaCount(ushort);
 #define ADV_VADDR_TO_U32   virt_to_bus
 #define ADV_U32_TO_VADDR   bus_to_virt
 
-#define AdvPortAddr  ulong              /* Virtual memory address size */
+#define AdvPortAddr  void __iomem *     /* Virtual memory address size */
 
 /*
  * Define Adv Library required memory access macros.