Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[sfrench/cifs-2.6.git] / drivers / platform / mips / cpu_hwmon.c

diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c
index 4993e19f153182d293a65ff6fdf94a406cef3d47..4300a558d0f39a4d15e7743368bc2a3a68e98b8e 100644 (file)
--- a/drivers/platform/mips/cpu_hwmon.c
+++ b/drivers/platform/mips/cpu_hwmon.c
@@ -20,9 +20,9 @@ int loongson3_cpu_temp(int cpu)
        u32 reg;
 
        reg = LOONGSON_CHIPTEMP(cpu);
-       if (loongson_sysconf.cputype == Loongson_3A)
+       if ((read_c0_prid() & PRID_REV_MASK) == PRID_REV_LOONGSON3A_R1)
                reg = (reg >> 8) & 0xff;
-       else if (loongson_sysconf.cputype == Loongson_3B)
+       else
                reg = ((reg >> 8) & 0xff) - 100;
 
        return (int)reg * 1000;