Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / arch / mips / math-emu / dp_flong.c

diff --git a/arch/mips/math-emu/dp_flong.c b/arch/mips/math-emu/dp_flong.c
index cb105b1dd860fcc37c1d1c5e19cc5ac3358913a4..f08f223e488a3a68a07038124dc045811b20bf98 100644 (file)
--- a/arch/mips/math-emu/dp_flong.c
+++ b/arch/mips/math-emu/dp_flong.c
@@ -29,12 +29,12 @@
 
 ieee754dp ieee754dp_flong(s64 x)
 {
-       COMPXDP;
+       u64 xm;
+       int xe;
+       int xs;
 
        CLEARCX;
 
-       xc = ( 0 ? xc : xc );
-
        if (x == 0)
                return ieee754dp_zero(0);
        if (x == 1 || x == -1)