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

diff --git a/arch/x86/cpu/sc520/sc520_timer.c b/arch/x86/cpu/sc520/sc520_timer.c
index 495a69459b86fd508087499aa33ec951f267a6f8..41f121f86fa37559ef73b174be56018c203daeb1 100644 (file)
--- 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);