From: Myron Stowe <myron.stowe@redhat.com>
Date: Tue, 26 Jun 2012 03:32:46 +0000 (-0600)
Subject: cris/PCI: factor out pcibios_setup()
X-Git-Tag: Ubuntu-5.10.0-12.13~20997^2~10^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f3328a0d4b29c060117cb238be862dedbc690fa9;p=mirror_ubuntu-hirsute-kernel.git

cris/PCI: factor out pcibios_setup()

The PCI core provides a generic pcibios_setup() routine.  Drop this
architecture-specific version in favor of that.

This patch fixes what looks like a bug in cris, which implements
pcibios_setup() such that pci_setup() doesn't look for any generic
options.

Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index bc0cfdad1cbc..5b1ee82f63c5 100644
--- a/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@ -6,11 +6,6 @@ void __devinit  pcibios_fixup_bus(struct pci_bus *b)
 {
 }
 
-char * __devinit  pcibios_setup(char *str)
-{
-	return NULL;
-}
-
 void pcibios_set_master(struct pci_dev *dev)
 {
 	u8 lat;