diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/mips/mips-boards/generic/pci.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/mips/mips-boards/generic/pci.c')
| -rw-r--r-- | arch/mips/mips-boards/generic/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c index 9337f6c8873..3192a14698c 100644 --- a/arch/mips/mips-boards/generic/pci.c +++ b/arch/mips/mips-boards/generic/pci.c | |||
| @@ -90,7 +90,7 @@ static struct pci_controller msc_controller = { | |||
| 90 | void __init mips_pcibios_init(void) | 90 | void __init mips_pcibios_init(void) |
| 91 | { | 91 | { |
| 92 | struct pci_controller *controller; | 92 | struct pci_controller *controller; |
| 93 | unsigned long start, end, map, start1, end1, map1, map2, map3, mask; | 93 | resource_size_t start, end, map, start1, end1, map1, map2, map3, mask; |
| 94 | 94 | ||
| 95 | switch (mips_revision_corid) { | 95 | switch (mips_revision_corid) { |
| 96 | case MIPS_REVISION_CORID_QED_RM5261: | 96 | case MIPS_REVISION_CORID_QED_RM5261: |