diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 07:08:16 -0400 |
| commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
| tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /arch/powerpc/kernel/pci-common.c | |
| parent | 510b37258dfd61693ca6c039865c78bd996e3718 (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 063cdd413049..224e9a11765c 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
| @@ -598,6 +598,7 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose, | |||
| 598 | res->start = pci_addr; | 598 | res->start = pci_addr; |
| 599 | break; | 599 | break; |
| 600 | case 2: /* PCI Memory space */ | 600 | case 2: /* PCI Memory space */ |
| 601 | case 3: /* PCI 64 bits Memory space */ | ||
| 601 | printk(KERN_INFO | 602 | printk(KERN_INFO |
| 602 | " MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n", | 603 | " MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n", |
| 603 | cpu_addr, cpu_addr + size - 1, pci_addr, | 604 | cpu_addr, cpu_addr + size - 1, pci_addr, |