aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/g_NCR5380.h
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2010-08-10 21:01:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:00 -0400
commit702a98c63355b74aec50897870eb1c89b5009cfb (patch)
tree786be5ca878bfa469e996d26d9ea9be6d870ddee /drivers/scsi/g_NCR5380.h
parentc94babbaf85c3162bd53a722ceeea32a0982d436 (diff)
g_NCR5380: fix broken MMIO compilation
The ifdefs are broken so the MMIO code is never compiled and so it's broken too. Fix them all. Untested as I don't have the hardware. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Andy Walls <awalls@md.metrocast.net> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/g_NCR5380.h')
-rw-r--r--drivers/scsi/g_NCR5380.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h
index df0b3f69ef63..921764c9ab24 100644
--- a/drivers/scsi/g_NCR5380.h
+++ b/drivers/scsi/g_NCR5380.h
@@ -63,7 +63,7 @@ static const char* generic_NCR5380_info(struct Scsi_Host *);
63#define __STRVAL(x) #x 63#define __STRVAL(x) #x
64#define STRVAL(x) __STRVAL(x) 64#define STRVAL(x) __STRVAL(x)
65 65
66#ifndef CONFIG_SCSI_G_NCR5380_MEM 66#ifndef SCSI_G_NCR5380_MEM
67 67
68#define NCR5380_map_config port 68#define NCR5380_map_config port
69#define NCR5380_map_type int 69#define NCR5380_map_type int
@@ -91,7 +91,7 @@ static const char* generic_NCR5380_info(struct Scsi_Host *);
91 NCR5380_map_name = (NCR5380_map_type)((instance)->NCR5380_instance_name) 91 NCR5380_map_name = (NCR5380_map_type)((instance)->NCR5380_instance_name)
92 92
93#else 93#else
94/* therefore CONFIG_SCSI_G_NCR5380_MEM */ 94/* therefore SCSI_G_NCR5380_MEM */
95 95
96#define NCR5380_map_config memory 96#define NCR5380_map_config memory
97#define NCR5380_map_type unsigned long 97#define NCR5380_map_type unsigned long
@@ -114,7 +114,7 @@ static const char* generic_NCR5380_info(struct Scsi_Host *);
114 register void __iomem *iomem 114 register void __iomem *iomem
115 115
116#define NCR5380_setup(instance) \ 116#define NCR5380_setup(instance) \
117 iomem = (((struct NCR5380_hostdata *)(instance)->hostdata).iomem) 117 iomem = (((struct NCR5380_hostdata *)(instance)->hostdata)->iomem)
118 118
119#endif 119#endif
120 120