From patchwork Thu Apr 18 10:11:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 237600 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 888A12C01C0 for ; Thu, 18 Apr 2013 20:11:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967660Ab3DRKLV (ORCPT ); Thu, 18 Apr 2013 06:11:21 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:39565 "EHLO mail-da0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755545Ab3DRKLU (ORCPT ); Thu, 18 Apr 2013 06:11:20 -0400 Received: by mail-da0-f45.google.com with SMTP id v40so1290361dad.4 for ; Thu, 18 Apr 2013 03:11:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=g6P7teZl4k0CSz5r8NoUfQ6YnqdtAC4pMirKHHga9Sk=; b=c90ZZBIRhXod9xwJguPDH4SDFmXlpgf4hA9jXeYN38e4aiVQ67MmT/C+FQjTNRPcY2 A82ZwUHtV8tHoXLA/D31oLgPtF+wgVXC/fr0OnrKsGMn9vvjqa+hDW9KI7xdOR60zDoT izxmWo3JIUJvyqP+GWJH02AdeehMsg0xmNG4x5cteKb9F3B3464zFn1koIsDK61dqmpr CtiXYR5QzMuyenoHDX/1pBoOViQgbzYD2GpGCJkkPwQGc8tNLSl0rISdd5owUOXHQCWn Lj1GbgdfIplPX0R8ZPLYPsNKSeV3Mc9chO6dQ0oerajQDOAfjo4wbdGdFfURcAS4DwZx StLw== X-Received: by 10.68.184.132 with SMTP id eu4mr13094288pbc.87.1366279879091; Thu, 18 Apr 2013 03:11:19 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id kd7sm9364960pbb.34.2013.04.18.03.11.16 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:11:17 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, Nobuhiro Iwamatsu Subject: [PATCH v2 1/8] net: sh-eth: Remove ifdef from definition of bit of EDSR and GECMR Date: Thu, 18 Apr 2013 19:11:02 +0900 Message-Id: <1366279869-23387-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkJrOuqJI+rUAhwp+0gCXTDYtpfWobfgIUEYmXNUxGc9JKRwwCbnQxr01DZbE38yxmz0il8 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Nobuhiro Iwamatsu --- v2: no change. drivers/net/ethernet/renesas/sh_eth.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index 6f9a997..f86ea96 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h @@ -166,19 +166,16 @@ enum { /* * Register's bits */ -#if defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763) ||\ - defined(CONFIG_ARCH_R8A7740) -/* EDSR */ +/* EDSR : sh7734, sh7764, sh7757 and r8a7740 only */ enum EDSR_BIT { EDSR_ENT = 0x01, EDSR_ENR = 0x02, }; #define EDSR_ENALL (EDSR_ENT|EDSR_ENR) -/* GECMR */ +/* GECMR : sh7734, sh7764 and r8a7740 only */ enum GECMR_BIT { GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01, }; -#endif /* EDMR */ enum DMAC_M_BIT {