summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-29 14:27:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-29 14:27:13 -0700
commit4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4 (patch)
tree4a7738c1703392c4d74bf6f7492630c310431812
parent543f2a3382bd7abd7380903518c61f00c7c87577 (diff)
downloadlinux-3.10-4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4.tar.gz
linux-3.10-4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4.tar.bz2
linux-3.10-4661e3eace2c7b8433476b5bf0ee437ab3c7dfd4.zip
[SCSI] advansys driver: limp along on x86
Let people enable the advansys driver on x86-32, even though it's broken on other architectures due to missing DMA mapping infrastructure. It's used by Jeffrey Phillips Freeman <jeffreyfreeman@syncleus.com> and possibly others. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/scsi/Kconfig4
-rw-r--r--drivers/scsi/advansys.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 3e7302692db..a480a3742d4 100644
--- a/drivers/scsi/Kconfig
+++ b/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/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 28b93057b60..2a419634b25 100644
--- a/drivers/scsi/advansys.c
+++ b/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.