diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2011-01-10 00:29:02 +0100 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-01-14 10:21:02 -0600 |
| commit | bc3e55c69c404158ef3c5b1a6515f5e9f1294403 (patch) | |
| tree | 4eec123c6424df4c3a05441f23e42753c098a38f /arch/arm/mach-pxa/zeus.c | |
| parent | cae399880f82fdc6b0afccf42224fc2a759aa6b3 (diff) | |
| download | op-kernel-dev-bc3e55c69c404158ef3c5b1a6515f5e9f1294403.zip op-kernel-dev-bc3e55c69c404158ef3c5b1a6515f5e9f1294403.tar.gz | |
ARM: pxa: fix warning in zeus.c
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/zeus.c')
| -rw-r--r-- | arch/arm/mach-pxa/zeus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index a894770..f4b053b 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c @@ -830,8 +830,8 @@ static void __init zeus_init(void) pr_info("Zeus CPLD V%dI%d\n", (system_rev & 0xf0) >> 4, (system_rev & 0x0f)); /* Fix timings for dm9000s (CS1/CS2)*/ - msc0 = __raw_readl(MSC0) & 0x0000ffff | (dm9000_msc << 16); - msc1 = __raw_readl(MSC1) & 0xffff0000 | dm9000_msc; + msc0 = (__raw_readl(MSC0) & 0x0000ffff) | (dm9000_msc << 16); + msc1 = (__raw_readl(MSC1) & 0xffff0000) | dm9000_msc; __raw_writel(msc0, MSC0); __raw_writel(msc1, MSC1); |
