From 473127b321d2ce60c96a0700f08a826abcd16476 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Tue, 12 May 2009 19:37:20 +0000
Subject: [PATCH] --- yaml --- r: 149350 b: refs/heads/master c:
 80153d1bcc6a20361d5974f37d3729583ba99154 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/smc91x.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 52bb940a3d3e..c2c1ce2cc557 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4036e1dea565207010408f5c6137a9d8d3c0ff5c
+refs/heads/master: 80153d1bcc6a20361d5974f37d3729583ba99154
diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h
index 329f890e2903..f1f773b17fe1 100644
--- a/trunk/drivers/net/smc91x.h
+++ b/trunk/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));