From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763300AbbA3V63 (ORCPT ); Fri, 30 Jan 2015 16:58:29 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:50296 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755190AbbA3V61 (ORCPT ); Fri, 30 Jan 2015 16:58:27 -0500 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: David Miller , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Grant Grundler Subject: [PATCH] net/tulip: don't warn about unknown ARM architecture Date: Fri, 30 Jan 2015 22:58:19 +0100 Message-ID: <1780413.LLpv9s01CB@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:4S8YerhnrBoaNUrzhE012EYn7Z5LhmTz8KaX6fG72P6rzk1oqxr 3pBnUoPuXGfX5bbMKt5tKBJ5sQgfq1eEgLYPgqnzMPGrixYF14BD8kDY0nxVVYquPRQqujY 3dPGUeYpFIzO5PzclPkqpe6dJVQrSObnEFUy5M2O+8CdNl4D1W6XRs/1GBroQant+rq66BS 9gu7u+1h30KImVIfjgimg== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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