From e6dd4f8dea0fff66b3af6b1d359b375dea483145 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 29 Apr 2006 14:27:13 -0700
Subject: [PATCH] --- yaml --- r: 26305 b: refs/heads/master c:
 4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4 h: refs/heads/master i:   26303:
 144c3799135ec76f2fd1933af62c12cdf3c98bba v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/Kconfig    | 4 +++-
 trunk/drivers/scsi/advansys.c | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 155b1f361fec..6303f663e402 100644
--- 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
index 3e7302692dbe..a480a3742d47 100644
--- 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
index 28b93057b607..2a419634b256 100644
--- 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.