diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2009-05-12 19:37:20 +0000 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-05 10:46:25 +0800 |
| commit | 80153d1bcc6a20361d5974f37d3729583ba99154 (patch) | |
| tree | 26c44d57c6f95005ee9d9655e8ce419d6b8221d7 | |
| parent | 4036e1dea565207010408f5c6137a9d8d3c0ff5c (diff) | |
| download | op-kernel-dev-80153d1bcc6a20361d5974f37d3729583ba99154.zip op-kernel-dev-80153d1bcc6a20361d5974f37d3729583ba99154.tar.gz | |
[ARM] pxa/stargate2: Add board specific elements to the smc91x driver
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
| -rw-r--r-- | drivers/net/smc91x.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 329f890..f1f773b 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -45,7 +45,8 @@ defined(CONFIG_MACH_ZYLONITE) ||\ defined(CONFIG_MACH_LITTLETON) ||\ defined(CONFIG_MACH_ZYLONITE2) ||\ - defined(CONFIG_ARCH_VIPER) + defined(CONFIG_ARCH_VIPER) ||\ + defined(CONFIG_MACH_STARGATE2) #include <asm/mach-types.h> @@ -73,7 +74,7 @@ /* We actually can't write halfwords properly if not word aligned */ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) { - if (machine_is_mainstone() && reg & 2) { + if ((machine_is_mainstone() || machine_is_stargate2()) && reg & 2) { unsigned int v = val << 16; v |= readl(ioaddr + (reg & ~2)) & 0xffff; writel(v, ioaddr + (reg & ~2)); |
