diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-29 19:05:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-29 19:05:47 +0200 |
| commit | f8c7e4ede46fe63ff10000669652648aab09d112 (patch) | |
| tree | 1b2d3ddc271cd57b516d35e5217d31f62b1c6143 /arch/ia64 | |
| parent | 4cd90083d32574e52ac839c6c7e4ff445ac4472c (diff) | |
| parent | 66d28b21fe6b3da8d1e9f0a7ba38bc61b6c547e1 (diff) | |
| download | linux-stable-f8c7e4ede46fe63ff10000669652648aab09d112.tar.gz linux-stable-f8c7e4ede46fe63ff10000669652648aab09d112.tar.bz2 linux-stable-f8c7e4ede46fe63ff10000669652648aab09d112.zip | |
Merge tag 'pci-v5.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull pci fixes from Bjorn Helgaas:
- Fix compilation warnings in new mt7621 driver (Sergio Paracuellos)
- Restore the sysfs "rom" file for VGA shadow ROMs, which was broken
when converting "rom" to be a static attribute (Bjorn Helgaas)
* tag 'pci-v5.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/sysfs: Find shadow ROM before static attribute initialization
PCI: mt7621: Remove unused function pcie_rmw()
PCI: mt7621: Drop of_match_ptr() to avoid unused variable
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/pci/fixup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c index acb55a41260d..2bcdd7d3a1ad 100644 --- a/arch/ia64/pci/fixup.c +++ b/arch/ia64/pci/fixup.c @@ -76,5 +76,5 @@ static void pci_fixup_video(struct pci_dev *pdev) } } } -DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video); +DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video); |