summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-01-30 22:58:19 +0100
committerDavid S. Miller <davem@davemloft.net>2015-02-02 18:53:34 -0800
commit98830dd0fed031264b9d6ccb85b582506da95886 (patch)
tree9e2cb51d3fd99e370cd4074abe6a5c5977f8fe12 /drivers/net
parent4c0c46be90b0316a75a6d0c44bf3f62152c6963f (diff)
downloadblackbird-obmc-linux-98830dd0fed031264b9d6ccb85b582506da95886.tar.gz
blackbird-obmc-linux-98830dd0fed031264b9d6ccb85b582506da95886.zip
net/tulip: don't warn about unknown ARM architecture
ARM has 32-byte cache lines, which according to the comment in the init registers function seems to work best with the default value of 0x4800 that is also used on sparc and parisc. This adds ARM to the same list, to use that default but no longer warn about it. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/dec/tulip/winbond-840.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 6aa887e0e1cb..9beb3d34d4ba 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -904,7 +904,7 @@ static void init_registers(struct net_device *dev)
}
#elif defined(__powerpc__) || defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
i |= 0xE000;
-#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC)
+#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC) || defined(CONFIG_ARM)
i |= 0x4800;
#else
#warning Processor architecture undefined
OpenPOWER on IntegriCloud