summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authormaxin.john@enea.com <maxin.john@enea.com>2014-07-24 14:09:05 +0200
committerTom Rini <trini@ti.com>2014-08-09 11:17:03 -0400
commit194c1ed4006062235f8c2ebdaaf3866eccd278b7 (patch)
treef6973f85a386cd13cadd499ef90171708df1f76c /arch
parent79e86ccb3786c8b20004db3fa10a70049456f580 (diff)
downloadu-boot-imx-194c1ed4006062235f8c2ebdaaf3866eccd278b7.zip
u-boot-imx-194c1ed4006062235f8c2ebdaaf3866eccd278b7.tar.gz
u-boot-imx-194c1ed4006062235f8c2ebdaaf3866eccd278b7.tar.bz2
emif.h: remove duplicated argument to |
Remove the duplicated argument to | in two places. Reported by Coccinelle (http://coccinelle.lip6.fr/). Signed-off-by: Maxin B. John <maxin.john@enea.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/emif.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/emif.h b/arch/arm/include/asm/emif.h
index b8d6bdc..2fe5776 100644
--- a/arch/arm/include/asm/emif.h
+++ b/arch/arm/include/asm/emif.h
@@ -878,7 +878,6 @@ struct dmm_lisa_map_regs {
((REG_CS_TIM << EMIF_REG_CS_TIM_SHIFT) & EMIF_REG_CS_TIM_MASK)|\
((REG_SR_TIM << EMIF_REG_SR_TIM_SHIFT) & EMIF_REG_SR_TIM_MASK)|\
((REG_PD_TIM << EMIF_REG_PD_TIM_SHIFT) & EMIF_REG_PD_TIM_MASK)|\
- ((REG_PD_TIM << EMIF_REG_PD_TIM_SHIFT) & EMIF_REG_PD_TIM_MASK)|\
((LP_MODE_DISABLE << EMIF_REG_LP_MODE_SHIFT)\
& EMIF_REG_LP_MODE_MASK) |\
((DPD_DISABLE << EMIF_REG_DPD_EN_SHIFT)\
@@ -890,8 +889,6 @@ struct dmm_lisa_map_regs {
((REG_SR_TIM << EMIF_REG_SR_TIM_SHDW_SHIFT)\
& EMIF_REG_SR_TIM_SHDW_MASK) |\
((REG_PD_TIM << EMIF_REG_PD_TIM_SHDW_SHIFT)\
- & EMIF_REG_PD_TIM_SHDW_MASK) |\
- ((REG_PD_TIM << EMIF_REG_PD_TIM_SHDW_SHIFT)\
& EMIF_REG_PD_TIM_SHDW_MASK))
/* EMIF_L3_CONFIG register value */