hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs
authorWoods, Brian <Brian.Woods@amd.com>
Tue, 6 Nov 2018 20:08:14 +0000 (20:08 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:05:23 +0000 (09:05 +0200)
commitd6d1f77e49ea368bbd9d03ac3fd058bde5d0446c
treebfc16978802b2542a34d0081198d4a71590bb703
parent07e51af181bec288287e8c244998f94fd23087ad
hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs

[ Upstream commit dedf7dce4cec5c0abe69f4fa6938d5100398220b ]

Consolidate shared PCI_DEVICE_IDs that were scattered through k10temp
and amd_nb, and move them into pci_ids.

Signed-off-by: Brian Woods <brian.woods@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Guenter Roeck <linux@roeck-us.net>
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Clemens Ladisch <clemens@ladisch.de>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Ingo Molnar <mingo@redhat.com>
CC: Jean Delvare <jdelvare@suse.com>
CC: Jia Zhang <qianyue.zj@alibaba-inc.com>
CC: <linux-hwmon@vger.kernel.org>
CC: <linux-pci@vger.kernel.org>
CC: Pu Wen <puwen@hygon.cn>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/20181106200754.60722-2-brian.woods@amd.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kernel/amd_nb.c
drivers/hwmon/k10temp.c
include/linux/pci_ids.h