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/microblaze/pci | |
| parent | 35e7f73c32ad44a931d918d04e317a7fb0c63e6e (diff) | |
| parent | 29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae (diff) | |
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/microblaze/pci')
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 9b32483cd0c0..bd61512a1be4 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -192,11 +192,6 @@ void pcibios_set_master(struct pci_dev *dev) /* No special bus mastering setup handling */ } -char __devinit *pcibios_setup(char *str) -{ - return str; -} - /* * Reads the interrupt pin to determine if interrupt is use by card. * If the interrupt is used, then gets the interrupt line from the |