diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 09:08:02 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-13 09:08:02 -0600 |
| commit | 6dabee73d46bfafb8c588b21b14606914de97ee6 (patch) | |
| tree | 140f679ec718d022e9946d8534af5cd7646340c6 /include/linux/pci.h | |
| parent | 78890b5989d96ddce989cde929c45ceeded0fcaf (diff) | |
| parent | 769ae543dc8d5745e1ade88cbcf1271a96276fd2 (diff) | |
Merge branch 'pci/trivial' into next
* pci/trivial:
PCI: Drop duplicate const in DECLARE_PCI_FIXUP_SECTION
PCI: Drop bogus default from ARCH_SUPPORTS_MSI
PCI: cpqphp: Remove unreachable path
PCI: Remove bus number resource debug messages
PCI/AER: Print completion message at KERN_INFO to match starting message
PCI: Fix drivers/pci/pci.c kernel-doc warnings
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index f3b074eb117..be1de01de1c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1504,7 +1504,7 @@ enum pci_fixup_pass { /* Anonymous variables would be nice... */ #define DECLARE_PCI_FIXUP_SECTION(section, name, vendor, device, class, \ class_shift, hook) \ - static const struct pci_fixup const __pci_fixup_##name __used \ + static const struct pci_fixup __pci_fixup_##name __used \ __attribute__((__section__(#section), aligned((sizeof(void *))))) \ = { vendor, device, class, class_shift, hook }; |