From effb79027e9a178c14e80f48c907332048d0fb3d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 22 Jan 2018 01:42:32 +0100 Subject: net: sh_eth: Unify CONFIG_R8A779[01234] as CONFIG_RCAR_GEN2 Use the common RCAR_GEN2 config option instead of enumerating each SoC and having a lengthy ifdef clause. No functional change. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Cc: Joe Hershberger --- drivers/net/sh_eth.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/net/sh_eth.h') diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index a0dcfcae09..ea4aa105bc 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -302,8 +302,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { #elif defined(CONFIG_R8A7740) #define SH_ETH_TYPE_GETHER #define BASE_IO_ADDR 0xE9A00000 -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ - defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) +#elif defined(CONFIG_RCAR_GEN2) #define SH_ETH_TYPE_ETHER #define BASE_IO_ADDR 0xEE700200 #elif defined(CONFIG_R7S72100) @@ -514,8 +513,7 @@ enum FELIC_MODE_BIT { ECMR_PRM = 0x00000001, #ifdef CONFIG_CPU_SH7724 ECMR_RTM = 0x00000010, -#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) || \ - defined(CONFIG_R8A7793) || defined(CONFIG_R8A7794) +#elif defined(CONFIG_RCAR_GEN2) ECMR_RTM = 0x00000004, #endif -- cgit v1.2.3