summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@redhat.com>2012-06-26 05:32:39 +0200
committerBjorn Helgaas <bhelgaas@google.com>2012-07-05 23:09:14 +0200
commit29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae (patch)
tree6e0f31e7c58ea0fb77638c7a777b9a996250e813 /arch
parentx86/PCI: adjust section annotations for pcibios_setup() (diff)
downloadlinux-29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae.tar.xz
linux-29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae.zip
xtensa/PCI: factor out pcibios_setup()
The PCI core provides a generic pcibios_setup() routine. Drop this architecture-specific version in favor of that. Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/xtensa/kernel/pci.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index eb30e356f5be..3a2cae4558b3 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -46,7 +46,6 @@
* pcibios_fixups
* pcibios_align_resource
* pcibios_fixup_bus
- * pcibios_setup
* pci_bus_add_device
* pci_mmap_page_range
*/
@@ -206,11 +205,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
}
}
-char __init *pcibios_setup(char *str)
-{
- return str;
-}
-
void pcibios_set_master(struct pci_dev *dev)
{
/* No special bus mastering setup handling */