Commit 6aabef68 authored Nov 10, 2015 by Linus Torvalds

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

parents 1eb196c3 ba953391

drivers/hwmon/k10temp.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)