diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:09:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:09:01 -0800 |
| commit | 6aabef681df96b851b4a11459520d4a20ab1cae4 (patch) | |
| tree | f23acdd2c2d732b70937c1db3c9e6a9a716689e1 /drivers/hwmon | |
| parent | 1eb196c3c01f364d6cd3e8c0e16dc4702fdaffd9 (diff) | |
| parent | ba953391e03fd3b9eb0db19814cadb201574b4e2 (diff) | |
| download | linux-stable-6aabef681df96b851b4a11459520d4a20ab1cae4.tar.gz linux-stable-6aabef681df96b851b4a11459520d4a20ab1cae4.tar.bz2 linux-stable-6aabef681df96b851b4a11459520d4a20ab1cae4.zip | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull tiny hwmon update from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (k10temp) Remove duplicate pci-id define
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/k10temp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 1e7bdcdcb295..9cdfde6515ad 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -60,7 +60,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); * Control] */ #define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET 0xd8200ca4 -#define PCI_DEVICE_ID_AMD_15H_M60H_NB_F3 0x1573 static void amd_nb_smu_index_read(struct pci_dev *pdev, unsigned int devfn, int offset, u32 *val) |