diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-06 01:31:05 +0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-06 01:31:05 +0400 |
commit | 85a00dd391d2de1e177c5ad8db5672428934ac20 (patch) | |
tree | 1dbf69da98dd2e4f6d5dfc75f8dacc00d1664f89 /include/linux/pci.h | |
parent | 35e7f73c32ad44a931d918d04e317a7fb0c63e6e (diff) | |
parent | 29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae (diff) | |
download | linux-85a00dd391d2de1e177c5ad8db5672428934ac20.tar.xz |
Merge branch 'pci/myron-pcibios_setup' into next
* pci/myron-pcibios_setup:
xtensa/PCI: factor out pcibios_setup()
x86/PCI: adjust section annotations for pcibios_setup()
unicore32/PCI: adjust section annotations for pcibios_setup()
tile/PCI: factor out pcibios_setup()
sparc/PCI: factor out pcibios_setup()
sh/PCI: adjust section annotations for pcibios_setup()
sh/PCI: factor out pcibios_setup()
powerpc/PCI: factor out pcibios_setup()
parisc/PCI: factor out pcibios_setup()
MIPS/PCI: adjust section annotations for pcibios_setup()
MIPS/PCI: factor out pcibios_setup()
microblaze/PCI: factor out pcibios_setup()
ia64/PCI: factor out pcibios_setup()
cris/PCI: factor out pcibios_setup()
alpha/PCI: factor out pcibios_setup()
PCI: pull pcibios_setup() up into core
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 0769aa409085..85cffb823b4e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -678,6 +678,7 @@ extern int no_pci_devices(void); void pcibios_fixup_bus(struct pci_bus *); int __must_check pcibios_enable_device(struct pci_dev *, int mask); +/* Architecture specific versions may override this (weak) */ char *pcibios_setup(char *str); /* Used only when drivers/pci/setup.c is used */ |