diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-30 20:34:39 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-30 20:34:39 +0100 |
| commit | b07019f29328ebb1b48d3faf952b84f07ec9b973 (patch) | |
| tree | 99fbd8379fb9fe17c5b06c74871f71207ebb072e /drivers/scsi/advansys.c | |
| parent | c3ce7e203af5d8eab7c3390fc991a1fcb152f741 (diff) | |
| parent | e0a515bc6a2188f02916e976f419a8640312e32a (diff) | |
| download | talos-obmc-linux-b07019f29328ebb1b48d3faf952b84f07ec9b973.tar.gz talos-obmc-linux-b07019f29328ebb1b48d3faf952b84f07ec9b973.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/scsi/advansys.c')
| -rw-r--r-- | drivers/scsi/advansys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 28b93057b607..2a419634b256 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. |
