Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[linux-2.6-microblaze.git] / drivers / hwmon / via-cputemp.c

diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 07a0cb0..0e81f28 100644 (file)
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -136,20 +136,24 @@ static int via_cputemp_probe(struct platform_device *pdev)
        data->id = pdev->id;
        data->name = "via_cputemp";
 
-       switch (c->x86_model) {
-       case 0xA:
-               /* C7 A */
-       case 0xD:
-               /* C7 D */
-               data->msr_temp = 0x1169;
-               data->msr_vid = 0x198;
-               break;
-       case 0xF:
-               /* Nano */
+       if (c->x86 == 7) {
                data->msr_temp = 0x1423;
-               break;
-       default:
-               return -ENODEV;
+       } else {
+               switch (c->x86_model) {
+               case 0xA:
+                       /* C7 A */
+               case 0xD:
+                       /* C7 D */
+                       data->msr_temp = 0x1169;
+                       data->msr_vid = 0x198;
+                       break;
+               case 0xF:
+                       /* Nano */
+                       data->msr_temp = 0x1423;
+                       break;
+               default:
+                       return -ENODEV;
+               }
        }
 
        /* test if we can access the TEMPERATURE MSR */
@@ -283,6 +287,7 @@ static const struct x86_cpu_id __initconst cputemp_ids[] = {
        { X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */
        { X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */
        { X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */
+       { X86_VENDOR_CENTAUR, 7, X86_MODEL_ANY, },
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);