aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/kernel
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@redhat.com>2012-06-25 23:32:39 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-07-05 17:09:14 -0400
commit29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae (patch)
tree6e0f31e7c58ea0fb77638c7a777b9a996250e813 /arch/xtensa/kernel
parent15fa325bebbe11184a051ed64965164fca8c1df2 (diff)
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/xtensa/kernel')
-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 @@
46 * pcibios_fixups 46 * pcibios_fixups
47 * pcibios_align_resource 47 * pcibios_align_resource
48 * pcibios_fixup_bus 48 * pcibios_fixup_bus
49 * pcibios_setup
50 * pci_bus_add_device 49 * pci_bus_add_device
51 * pci_mmap_page_range 50 * pci_mmap_page_range
52 */ 51 */
@@ -206,11 +205,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
206 } 205 }
207} 206}
208 207
209char __init *pcibios_setup(char *str)
210{
211 return str;
212}
213
214void pcibios_set_master(struct pci_dev *dev) 208void pcibios_set_master(struct pci_dev *dev)
215{ 209{
216 /* No special bus mastering setup handling */ 210 /* No special bus mastering setup handling */