summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-13 17:51:46 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-15 10:13:29 +1100
commit7b6b574ca7d5d5ba6ae7155c1fb877cc7130eff7 (patch)
tree6eeb13d0af87fa3e5deed56c864235d538e785d9
parentb556151110ff003ce77d84597400c84824690ccf (diff)
downloadop-kernel-dev-7b6b574ca7d5d5ba6ae7155c1fb877cc7130eff7.zip
op-kernel-dev-7b6b574ca7d5d5ba6ae7155c1fb877cc7130eff7.tar.gz
powerpc: Fix link errors on 32-bit machines using legacy DMA
The new merged DMA code will try to access isa_bridge_pcidev when trying to DMA to/from legacy devices. This is however only defined on 64-bit. Fixes this for now by adding the variable, even if it stays NULL. In the long run, we'll make isa-bridge.c common to 32 and 64-bit. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/pci_32.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index a848c63..131b1df 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -53,6 +53,12 @@ LIST_HEAD(hose_list);
static int pci_bus_count;
+/* This will remain NULL for now, until isa-bridge.c is made common
+ * to both 32-bit and 64-bit.
+ */
+struct pci_dev *isa_bridge_pcidev;
+EXPORT_SYMBOL_GPL(isa_bridge_pcidev);
+
static void
fixup_hide_host_resource_fsl(struct pci_dev *dev)
{
OpenPOWER on IntegriCloud