diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /arch/mips/pci/ops-au1000.c | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/pci/ops-au1000.c')
| -rw-r--r-- | arch/mips/pci/ops-au1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c index 7932dfe5eb9b..6b29904acf45 100644 --- a/arch/mips/pci/ops-au1000.c +++ b/arch/mips/pci/ops-au1000.c | |||
| @@ -112,7 +112,7 @@ static int config_access(unsigned char access_type, struct pci_bus *bus, | |||
| 112 | first_cfg = 0; | 112 | first_cfg = 0; |
| 113 | pci_cfg_vm = get_vm_area(0x2000, VM_IOREMAP); | 113 | pci_cfg_vm = get_vm_area(0x2000, VM_IOREMAP); |
| 114 | if (!pci_cfg_vm) | 114 | if (!pci_cfg_vm) |
| 115 | panic (KERN_ERR "PCI unable to get vm area\n"); | 115 | panic(KERN_ERR "PCI unable to get vm area\n"); |
| 116 | pci_cfg_wired_entry = read_c0_wired(); | 116 | pci_cfg_wired_entry = read_c0_wired(); |
| 117 | add_wired_entry(0, 0, (unsigned long)pci_cfg_vm->addr, PM_4K); | 117 | add_wired_entry(0, 0, (unsigned long)pci_cfg_vm->addr, PM_4K); |
| 118 | last_entryLo0 = last_entryLo1 = 0xffffffff; | 118 | last_entryLo0 = last_entryLo1 = 0xffffffff; |