aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/hwmon/k10temp6
-rw-r--r--drivers/hwmon/Kconfig4
-rw-r--r--drivers/hwmon/k10temp.c1
3 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
index 4dfdc8f83633..ee6d30ec1522 100644
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
@@ -11,8 +11,8 @@ Supported chips:
11 Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra) 11 Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)
12* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series) 12* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
13* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series) 13* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
14* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity" 14* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri"
15* AMD Family 16h processors: "Kabini" 15* AMD Family 16h processors: "Kabini", "Mullins"
16 16
17 Prefix: 'k10temp' 17 Prefix: 'k10temp'
18 Addresses scanned: PCI space 18 Addresses scanned: PCI space
@@ -46,7 +46,7 @@ Description
46----------- 46-----------
47 47
48This driver permits reading of the internal temperature sensor of AMD 48This driver permits reading of the internal temperature sensor of AMD
49Family 10h/11h/12h/14h/15h processors. 49Family 10h/11h/12h/14h/15h/16h processors.
50 50
51All these processors have a sensor, but on those for Socket F or AM2+, 51All these processors have a sensor, but on those for Socket F or AM2+,
52the sensor may return inconsistent values (erratum 319). The driver 52the sensor may return inconsistent values (erratum 319). The driver
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index b53d87958710..b13172cfbeef 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -280,8 +280,8 @@ config SENSORS_K10TEMP
280 If you say yes here you get support for the temperature 280 If you say yes here you get support for the temperature
281 sensor(s) inside your CPU. Supported are later revisions of 281 sensor(s) inside your CPU. Supported are later revisions of
282 the AMD Family 10h and all revisions of the AMD Family 11h, 282 the AMD Family 10h and all revisions of the AMD Family 11h,
283 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and 283 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity/Kaveri) and
284 16h (Kabini) microarchitectures. 284 16h (Kabini/Mullins) microarchitectures.
285 285
286 This driver can also be built as a module. If so, the module 286 This driver can also be built as a module. If so, the module
287 will be called k10temp. 287 will be called k10temp.
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index baf375b5ab0d..f7b46f68ef43 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -212,6 +212,7 @@ static const struct pci_device_id k10temp_id_table[] = {
212 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, 212 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
213 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) }, 213 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
214 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, 214 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
215 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },
215 {} 216 {}
216}; 217};
217MODULE_DEVICE_TABLE(pci, k10temp_id_table); 218MODULE_DEVICE_TABLE(pci, k10temp_id_table);