From 67984f035adf74318ec5b584968b59d135c5d995 Mon Sep 17 00:00:00 2001 From: Myron Stowe Date: Mon, 25 Jun 2012 21:31:58 -0600 Subject: [PATCH] --- yaml --- r: 316525 b: refs/heads/master c: 86927f9344ebfc1e4059eb774dbd975d50b7766b h: refs/heads/master i: 316523: 252991ad5928707af4e83f2a2a37c1662d3319c6 v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/pci.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 787c8a0be143..440b53393384 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67ea194ad312b8916917480faebf76fa5d9454a2 +refs/heads/master: 86927f9344ebfc1e4059eb774dbd975d50b7766b diff --git a/trunk/arch/sh/drivers/pci/pci.c b/trunk/arch/sh/drivers/pci/pci.c index 9d10a3cb8797..7d42288e1057 100644 --- a/trunk/arch/sh/drivers/pci/pci.c +++ b/trunk/arch/sh/drivers/pci/pci.c @@ -197,11 +197,6 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq) pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); } -char * __devinit __weak pcibios_setup(char *str) -{ - return str; -} - static void __init pcibios_bus_report_status_early(struct pci_channel *hose, int top_bus, int current_bus,