Skip to content

Commit

Permalink
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Nov 10, 2015
2 parents 1eb196c + ba95339 commit 6aabef6
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/hwmon/k10temp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6aabef6

Please sign in to comment.