asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sh_eth: remove #ifdef around EDSR and GECMR bit definitions

Browse source 
Remove #ifdef around 'enum EDSR_BIT' and 'enum GECMR_BIT', replacing it with the
comments on which SoCs these registers exist.

SH7757 also has EDSR, so add a comment about it to 'enum EDSR_BIT'.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
[Sergei: folded in the former patch #2, updated the changelog, reworded the
subject, changing the prefix.]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nobuhiro Iwamatsu 2013-06-06 09:43:16 +00:00 committed by David S. Miller
parent 143554ace8
commit 41d5ffeb9d
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/ethernet/renesas/sh_eth.h
View file

@ -166,19 +166,16 @@ enum {
/* /*
* Register's bits * Register's bits
*/ */
#if defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763) ||\ /* EDSR : sh7734, sh7757, sh7763, and r8a7740 only */
defined(CONFIG_ARCH_R8A7740)
/* EDSR */
enum EDSR_BIT { enum EDSR_BIT {
EDSR_ENT = 0x01, EDSR_ENR = 0x02, EDSR_ENT = 0x01, EDSR_ENR = 0x02,
}; };
#define EDSR_ENALL (EDSR_ENT|EDSR_ENR) #define EDSR_ENALL (EDSR_ENT|EDSR_ENR)
/* GECMR */ /* GECMR : sh7734, sh7763 and r8a7740 only */
enum GECMR_BIT { enum GECMR_BIT {
GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01, GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01,
}; };
#endif
/* EDMR */ /* EDMR */
enum DMAC_M_BIT { enum DMAC_M_BIT {