diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-08-24 22:32:24 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-08-24 22:32:24 +0200 |
commit | 83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb (patch) | |
tree | e59186b4d315c80255851e0d204143ecc21399a0 /arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c | |
parent | e21ded5ecc531a64d6fc0c1693285e890b4e9569 (diff) | |
parent | 451fd72219dd6f3355e2d036c598544c760ee532 (diff) |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts:
arch/x86/kernel/cpu/perf_event_intel_uncore*.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c index d3e9c55d984a..6606ed05d311 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c @@ -960,7 +960,7 @@ static struct intel_uncore_type *snbep_pci_uncores[] = { NULL, }; -static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = { +static const struct pci_device_id snbep_uncore_pci_ids[] = { { /* Home Agent */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA), .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0), @@ -1542,7 +1542,7 @@ static struct intel_uncore_type *ivbep_pci_uncores[] = { NULL, }; -static DEFINE_PCI_DEVICE_TABLE(ivbep_uncore_pci_ids) = { +static const struct pci_device_id ivbep_uncore_pci_ids[] = { { /* Home Agent 0 */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30), .driver_data = UNCORE_PCI_DEV_DATA(IVBEP_PCI_UNCORE_HA, 0), |