diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/pci/setup-bus.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 262b0439abe9..125e7b7f34ff 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -206,10 +206,8 @@ pci_setup_bridge(struct pci_bus *bus) | |||
| 206 | if (bus->resource[2]->flags & IORESOURCE_PREFETCH) { | 206 | if (bus->resource[2]->flags & IORESOURCE_PREFETCH) { |
| 207 | l = (region.start >> 16) & 0xfff0; | 207 | l = (region.start >> 16) & 0xfff0; |
| 208 | l |= region.end & 0xfff00000; | 208 | l |= region.end & 0xfff00000; |
| 209 | #ifdef CONFIG_RESOURCES_64BIT | 209 | bu = upper_32_bits(region.start); |
| 210 | bu = region.start >> 32; | 210 | lu = upper_32_bits(region.end); |
| 211 | lu = region.end >> 32; | ||
| 212 | #endif | ||
| 213 | DBG(KERN_INFO " PREFETCH window: 0x%016llx-0x%016llx\n", | 211 | DBG(KERN_INFO " PREFETCH window: 0x%016llx-0x%016llx\n", |
| 214 | (unsigned long long)region.start, | 212 | (unsigned long long)region.start, |
| 215 | (unsigned long long)region.end); | 213 | (unsigned long long)region.end); |