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 branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[pandora-kernel.git]
/
arch
/
mips
/
pci
/
pci-ocelot.c
diff --git
a/arch/mips/pci/pci-ocelot.c
b/arch/mips/pci/pci-ocelot.c
index
2b9495d
..
7f94f26
100644
(file)
--- a/
arch/mips/pci/pci-ocelot.c
+++ b/
arch/mips/pci/pci-ocelot.c
@@
-81,7
+81,7
@@
static struct resource ocelot_io_resource = {
};
static struct pci_controller ocelot_pci_controller = {
- .pci_ops = gt64
120_pci
_ops;
+ .pci_ops = gt64
xxx_pci0
_ops;
.mem_resource = &ocelot_mem_resource;
.io_resource = &ocelot_io_resource;
};