From: Myron Stowe <myron.stowe@redhat.com>
Date: Tue, 26 Jun 2012 03:32:39 +0000 (-0600)
Subject: xtensa/PCI: factor out pcibios_setup()
X-Git-Tag: next-20120724~86^2~10^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae;p=karo-tx-linux.git

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>
---

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 */