summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorMyron Stowe <myron.stowe@redhat.com>2012-06-25 21:32:46 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-07-05 15:09:07 -0600
commitf3328a0d4b29c060117cb238be862dedbc690fa9 (patch)
treeeaf7157873d79570e63bfb51285ef184c2addad9 /arch/cris
parent9d74c5c0a3194f7a4351c47db09449a2e1d97ec1 (diff)
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>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/drivers/pci/bios.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index bc0cfdad1cb..5b1ee82f63c 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;