diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 17:16:21 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-03-22 17:16:21 -0500 |
| commit | 73c82469bd88ce1c9a4403f34582e544e77f4854 (patch) | |
| tree | 7a2f0aed1983981c6f07d32280ca5204f5473db3 /arch | |
| parent | f787b6821423fe0d79b63ef29ff3cb48b99af34b (diff) | |
| parent | b9fae6a47b8bcb397e6a482095431f6ba9648211 (diff) | |
| download | linux-stable-73c82469bd88ce1c9a4403f34582e544e77f4854.tar.gz linux-stable-73c82469bd88ce1c9a4403f34582e544e77f4854.tar.bz2 linux-stable-73c82469bd88ce1c9a4403f34582e544e77f4854.zip | |
Merge branch 'pci/misc'
- Update the aer-inject URL (Yicong Yang)
- Declare pci_filp_private only when HAVE_PCI_MMAP to avoid unused struct
definition (Krzysztof Wilczyński)
- Remove unused assignments (Bjorn Helgaas)
- Add #includes to asm/pci_x86.h to prevent build errors (Randy Dunlap)
* pci/misc:
x86/PCI: Add #includes to asm/pci_x86.h
PCI: ibmphp: Remove unused assignments
PCI: cpqphp: Remove unused assignments
PCI: fu740: Remove unused assignments
PCI: kirin: Remove unused assignments
PCI: Remove unused assignments
PCI: Declare pci_filp_private only when HAVE_PCI_MMAP
PCI/AER: Update aer-inject URL
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/pci_x86.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index 490411dba438..042972394c32 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -5,7 +5,10 @@ * (c) 1999 Martin Mares <mj@ucw.cz> */ +#include <linux/errno.h> +#include <linux/init.h> #include <linux/ioport.h> +#include <linux/spinlock.h> #undef DEBUG |