projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d74c5c
)
cris/PCI: factor out pcibios_setup()
author
Myron Stowe
<myron.stowe@redhat.com>
Tue, 26 Jun 2012 03:32:46 +0000
(21:32 -0600)
committer
Bjorn Helgaas
<bhelgaas@google.com>
Thu, 5 Jul 2012 21:09:07 +0000
(15:09 -0600)
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>
arch/cris/arch-v32/drivers/pci/bios.c
patch
|
blob
|
history
diff --git
a/arch/cris/arch-v32/drivers/pci/bios.c
b/arch/cris/arch-v32/drivers/pci/bios.c
index
bc0cfda
..
5b1ee82
100644
(file)
--- 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;