git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
mips
/
pci
/
pcie-octeon.c
diff --git
a/arch/mips/pci/pcie-octeon.c
b/arch/mips/pci/pcie-octeon.c
index
861361e
..
385f035
100644
(file)
--- a/
arch/mips/pci/pcie-octeon.c
+++ b/
arch/mips/pci/pcie-octeon.c
@@
-75,6
+75,8
@@
union cvmx_pcie_address {
} mem;
};
} mem;
};
+#include <dma-coherence.h>
+
/**
* Return the Core virtual base address for PCIe IO access. IOs are
* read/written as an offset from this address.
/**
* Return the Core virtual base address for PCIe IO access. IOs are
* read/written as an offset from this address.
@@
-1391,6
+1393,9
@@
static int __init octeon_pcie_setup(void)
cvmx_pcie_get_io_size(1) - 1;
register_pci_controller(&octeon_pcie1_controller);
}
cvmx_pcie_get_io_size(1) - 1;
register_pci_controller(&octeon_pcie1_controller);
}
+
+ octeon_pci_dma_init();
+
return 0;
}
return 0;
}