diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-07-19 10:10:33 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-07-19 10:10:33 -0500 |
| commit | 45659274e60864f9acabba844468e405362bdc8c (patch) | |
| tree | 0b9906900581ffe3f65528c2503286e0841600eb /drivers/pci/pci-mid.c | |
| parent | 19a3eec1e7cc04901f8b14f6244345cd83a8507f (diff) | |
| parent | 142a41da39d1467b7ff7dad64fc421249d06565d (diff) | |
Merge branch 'pci/misc'
- Remove unused struct 'acpi_handle_node' (Dr. David Alan Gilbert)
- Use array notation for portdrv .id_table consistently (Masahiro Yamada)
- Switch to new Intel CPU model defines (Tony Luck)
- Add missing MODULE_DESCRIPTION() macros (Jeff Johnson)
* pci/misc:
PCI: controller: Add missing MODULE_DESCRIPTION() macros
PCI: Add missing MODULE_DESCRIPTION() macros
PCI/PM: Switch to new Intel CPU model defines
PCI: Use array for .id_table consistently
ACPI: PCI: Remove unused struct 'acpi_handle_node'
Diffstat (limited to 'drivers/pci/pci-mid.c')
| -rw-r--r-- | drivers/pci/pci-mid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c index fbfd78127123..bed9f0755271 100644 --- a/drivers/pci/pci-mid.c +++ b/drivers/pci/pci-mid.c @@ -38,8 +38,8 @@ pci_power_t mid_pci_get_power_state(struct pci_dev *pdev) * arch/x86/platform/intel-mid/pwr.c. */ static const struct x86_cpu_id lpss_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL), + X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, NULL), + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL), {} }; |