  	if (family != 0x0f || model >= 0x40) {
  		cpuid = pci_read_config(dev, AMDTEMP_CPUID, 4);
  		family = CPUID_TO_FAMILY(cpuid);
-@@ -232,11 +244,6 @@
+@@ -232,11 +247,6 @@
  		/*
  		 * Thermaltrip Status Register
  		 *

 		}
 
 		/*
@@ -273,7 +302,31 @@
 		sc->sc_gettemp = amdtemp_gettemp0f;
 		break;
 	case 0x10:

 	if (bootverbose)
 		device_printf(dev, "Found %d cores and %d sensors.\n",
 		    sc->sc_ncores,
@@ -297,41 +357,49 @@
 	/*
 	 * dev.amdtemp.N tree.
 	 */
