diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-05 15:31:05 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-05 15:31:05 -0600 |
| commit | 85a00dd391d2de1e177c5ad8db5672428934ac20 (patch) | |
| tree | 1dbf69da98dd2e4f6d5dfc75f8dacc00d1664f89 /arch/x86/pci | |
| parent | 35e7f73c32ad44a931d918d04e317a7fb0c63e6e (diff) | |
| parent | 29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae (diff) | |
| download | blackbird-obmc-linux-85a00dd391d2de1e177c5ad8db5672428934ac20.tar.gz blackbird-obmc-linux-85a00dd391d2de1e177c5ad8db5672428934ac20.zip | |
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 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 0ad990a20d4a..720e973fc34a 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -494,7 +494,7 @@ int __init pcibios_init(void) return 0; } -char * __devinit pcibios_setup(char *str) +char * __init pcibios_setup(char *str) { if (!strcmp(str, "off")) { pci_probe = 0; |
