[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120626033246.16434.46899.stgit@amt.stowe>
Date: Mon, 25 Jun 2012 21:32:46 -0600
From: Myron Stowe <myron.stowe@...hat.com>
To: bhelgaas@...gle.com
Cc: linux-pci@...r.kernel.org, rth@...ddle.net,
ink@...assic.park.msu.ru, mattst88@...il.com,
linux@....linux.org.uk, starvik@...s.com, jesper.nilsson@...s.com,
tony.luck@...el.com, fenghua.yu@...el.com, monstr@...str.eu,
ralf@...ux-mips.org, yasutake.koichi@...panasonic.com,
jejb@...isc-linux.org, deller@....de, benh@...nel.crashing.org,
paulus@...ba.org, lethal@...ux-sh.org, davem@...emloft.net,
cmetcalf@...era.com, gxt@...c.pku.edu.cn, tglx@...utronix.de,
mingo@...hat.com, hpa@...or.com, x86@...nel.org, chris@...kel.net,
linux-kernel@...r.kernel.org
Subject: [PATCH 16/16] cris/PCI: Factor 'pcibios_setup()' out of cris
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.
The PCI core provides a generic (__weak) 'pcibios_setup()' routine
that can be used by all architectures as a default. Drop cris's
architecture specific version in favor of that as it does not need to be
over-ridden.
Signed-off-by: Myron Stowe <myron.stowe@...hat.com>
---
arch/cris/arch-v32/drivers/pci/bios.c | 5 -----
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 bc0cfda..5b1ee82 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists