aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c6
-rw-r--r--include/linux/pci_ids.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
index ca75e70865ef..4562e9e22c60 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
@@ -1,7 +1,11 @@
1/* Nehalem/SandBridge/Haswell uncore support */ 1/* Nehalem/SandBridge/Haswell uncore support */
2#include "perf_event_intel_uncore.h" 2#include "perf_event_intel_uncore.h"
3 3
4/* Uncore IMC PCI Id */ 4/* Uncore IMC PCI IDs */
5#define PCI_DEVICE_ID_INTEL_SNB_IMC 0x0100
6#define PCI_DEVICE_ID_INTEL_IVB_IMC 0x0154
7#define PCI_DEVICE_ID_INTEL_IVB_E3_IMC 0x0150
8#define PCI_DEVICE_ID_INTEL_HSW_IMC 0x0c00
5#define PCI_DEVICE_ID_INTEL_HSW_U_IMC 0x0a04 9#define PCI_DEVICE_ID_INTEL_HSW_U_IMC 0x0a04
6 10
7/* SNB event control */ 11/* SNB event control */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e63c02a93f6b..a59385852233 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2539,10 +2539,6 @@
2539 2539
2540#define PCI_VENDOR_ID_INTEL 0x8086 2540#define PCI_VENDOR_ID_INTEL 0x8086
2541#define PCI_DEVICE_ID_INTEL_EESSC 0x0008 2541#define PCI_DEVICE_ID_INTEL_EESSC 0x0008
2542#define PCI_DEVICE_ID_INTEL_SNB_IMC 0x0100
2543#define PCI_DEVICE_ID_INTEL_IVB_IMC 0x0154
2544#define PCI_DEVICE_ID_INTEL_IVB_E3_IMC 0x0150
2545#define PCI_DEVICE_ID_INTEL_HSW_IMC 0x0c00
2546#define PCI_DEVICE_ID_INTEL_PXHD_0 0x0320 2542#define PCI_DEVICE_ID_INTEL_PXHD_0 0x0320
2547#define PCI_DEVICE_ID_INTEL_PXHD_1 0x0321 2543#define PCI_DEVICE_ID_INTEL_PXHD_1 0x0321
2548#define PCI_DEVICE_ID_INTEL_PXH_0 0x0329 2544#define PCI_DEVICE_ID_INTEL_PXH_0 0x0329