summaryrefslogtreecommitdiff
path: root/arch/sh/drivers/pci/pci.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-10-14 02:37:01 +0400
committerPaul Mundt <lethal@linux-sh.org>2010-10-14 02:37:01 +0400
commit61a46766c9d5d8fb5dad23da1b7cc4cb8b0107da (patch)
tree6b91ef707e1a1e4d202ab817ac066509a72b1c8b /arch/sh/drivers/pci/pci.c
parentf7fcec93b619337feb9da829b8a9ab6ba86393bc (diff)
downloadlinux-61a46766c9d5d8fb5dad23da1b7cc4cb8b0107da.tar.xz
sh: pci: Support slot 4 routing on SDK7786.
SDK7786 supports connecting either slot3 or 4 to the same PCIe port by way of FPGA muxing. By default the vertical slot 3 on the baseboard is enabled, so this adds in a command line option for forcibly enabling the slot 4 edge connector. If nothing has been specified on the command line, we fall back to reading the resistor values for card presence to figure out where to route the port to. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
-rw-r--r--arch/sh/drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index af4191bbb179..60ee09a4e121 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -268,7 +268,7 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
}
-char * __devinit pcibios_setup(char *str)
+char * __devinit __weak pcibios_setup(char *str)
{
return str;
}