From 24b3b54d2e8abf48c9066351d0c96c2ed9d63863 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 26 Jun 2011 13:55:24 -0400 Subject: [PATCH] --- yaml --- r: 257893 b: refs/heads/master c: 85c2737ae7c2b64c35862da3757b185e822a259b h: refs/heads/master i: 257891: e7f299e371f8ce413c60662ff53e19ce3993608d v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-common/dpmc_modes.S | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a254f6c3f66e..1d7040dedd34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a7e5413ca17b59d09badc49b3be92e44c47247d +refs/heads/master: 85c2737ae7c2b64c35862da3757b185e822a259b diff --git a/trunk/arch/blackfin/mach-common/dpmc_modes.S b/trunk/arch/blackfin/mach-common/dpmc_modes.S index 9cfdd49a3127..6ecc64e5a06a 100644 --- a/trunk/arch/blackfin/mach-common/dpmc_modes.S +++ b/trunk/arch/blackfin/mach-common/dpmc_modes.S @@ -238,18 +238,17 @@ ENTRY(_unset_dram_srfs) ENDPROC(_unset_dram_srfs) ENTRY(_set_sic_iwr) -#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) || \ - defined(CONFIG_BF538) || defined(CONFIG_BF539) || defined(CONFIG_BF51x) +#ifdef SIC_IWR0 P0.H = hi(SIC_IWR0); P0.L = lo(SIC_IWR0); P1.H = hi(SIC_IWR1); P1.L = lo(SIC_IWR1); [P1] = R1; -#if defined(CONFIG_BF54x) +# ifdef SIC_IWR2 P1.H = hi(SIC_IWR2); P1.L = lo(SIC_IWR2); [P1] = R2; -#endif +# endif #else P0.H = hi(SIC_IWR); P0.L = lo(SIC_IWR);