| Message ID | 20120626033246.16434.46899.stgit@amt.stowe |
|---|---|
| State | Accepted |
| Headers | show |
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;
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@redhat.com> --- arch/cris/arch-v32/drivers/pci/bios.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html