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
This commit is contained in:
Wolfgang Denk 2012-03-06 21:28:45 +01:00
commit 12ae615fba

View file

@ -78,10 +78,9 @@ void sc520_udelay(unsigned long usec)
{ {
int m = 0; int m = 0;
long u; long u;
long temp;
temp = readw(&sc520_mmcr->swtmrmilli); readw(&sc520_mmcr->swtmrmilli);
temp = readw(&sc520_mmcr->swtmrmicro); readw(&sc520_mmcr->swtmrmicro);
do { do {
m += readw(&sc520_mmcr->swtmrmilli); m += readw(&sc520_mmcr->swtmrmilli);