diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 23:53:37 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 23:53:37 (GMT) |
| commit | 3cf59142bcd391680beb6932838fe09a73947705 (patch) | |
| tree | 4067c594861e86b6000e83e4b34c75d210093621 /drivers | |
| parent | 154d6f18a48e00dec2dc84a96914fe1a24669577 (diff) | |
| parent | ec0159503ae74aeb834e78366bdf4b9663ca1129 (diff) | |
| download | linux-3cf59142bcd391680beb6932838fe09a73947705.tar.xz | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull second round of hwmon updates from Guenter Roeck:
"Add support for AMD F16 M30h processor to k10temp driver.
This adds one more patch which had secondary dependencies. The branch
point is arbitrary, but I did run a full set of build and qemu tests
on it. While there are some new build failures (6 out of 122 in my
builds), none are due to this commit"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (k10temp) Add support for AMD F16 M30h processor
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/hwmon/k10temp.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index b53d879..b13172c 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -280,8 +280,8 @@ config SENSORS_K10TEMP If you say yes here you get support for the temperature sensor(s) inside your CPU. Supported are later revisions of the AMD Family 10h and all revisions of the AMD Family 11h, - 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and - 16h (Kabini) microarchitectures. + 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity/Kaveri) and + 16h (Kabini/Mullins) microarchitectures. This driver can also be built as a module. If so, the module will be called k10temp. diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index baf375b..f7b46f6 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -212,6 +212,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, {} }; MODULE_DEVICE_TABLE(pci, k10temp_id_table); |