aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci-jmr3927.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-18 13:23:21 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-18 13:23:21 -0500
commit638cbac8de9b57345a9446e107b6aebc10b58970 (patch)
treee445fe3a1b8ad718d7ee770ed1c7a43e3eb5a611 /arch/mips/pci/pci-jmr3927.c
parentf055408957750cf759162c364c2a4dfe19765844 (diff)
parentfc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff)
Merge branch 'master'
Diffstat (limited to 'arch/mips/pci/pci-jmr3927.c')
-rw-r--r--arch/mips/pci/pci-jmr3927.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c
index 95a028769e56..f02ef6e36b02 100644
--- a/arch/mips/pci/pci-jmr3927.c
+++ b/arch/mips/pci/pci-jmr3927.c
@@ -54,5 +54,5 @@ struct pci_controller jmr3927_controller = {
54 .pci_ops = &jmr3927_pci_ops, 54 .pci_ops = &jmr3927_pci_ops,
55 .io_resource = &pci_io_resource, 55 .io_resource = &pci_io_resource,
56 .mem_resource = &pci_mem_resource, 56 .mem_resource = &pci_mem_resource,
57 .mem_offset = JMR3927_PCIMEM; 57 .mem_offset = JMR3927_PCIMEM
58}; 58};