summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-03-06 21:28:45 +0100
committerWolfgang Denk <wd@denx.de>2012-03-06 21:28:45 +0100
commit12ae615fba9ac962df97d1367291c9563bfb6da4 (patch)
tree7571cdbab9a08625640d7b9053e657f6be578bbb /arch
parent021f6038a233bc6a60edc4adc1819492fddff9ff (diff)
parentae806cc6ab86c911180e7da253d847843c079608 (diff)
downloadu-boot-imx-12ae615fba9ac962df97d1367291c9563bfb6da4.zip
u-boot-imx-12ae615fba9ac962df97d1367291c9563bfb6da4.tar.gz
u-boot-imx-12ae615fba9ac962df97d1367291c9563bfb6da4.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-x86
* 'master' of git://git.denx.de/u-boot-x86: sc520: fix build warning about unused temp var
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/cpu/sc520/sc520_timer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/cpu/sc520/sc520_timer.c b/arch/x86/cpu/sc520/sc520_timer.c
index 495a694..41f121f 100644
--- a/arch/x86/cpu/sc520/sc520_timer.c
+++ b/arch/x86/cpu/sc520/sc520_timer.c
@@ -78,10 +78,9 @@ void sc520_udelay(unsigned long usec)
{
int m = 0;
long u;
- long temp;
- temp = readw(&sc520_mmcr->swtmrmilli);
- temp = readw(&sc520_mmcr->swtmrmicro);
+ readw(&sc520_mmcr->swtmrmilli);
+ readw(&sc520_mmcr->swtmrmicro);
do {
m += readw(&sc520_mmcr->swtmrmilli);