summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-12-05 04:54:58 +1000
committerDave Airlie <airlied@redhat.com>2007-12-05 04:56:54 +1000
commit2f6e53342156ecb0e61a13816043445032c2b539 (patch)
tree9cf0c380745475938da57fa4897473bbb25bcd1c /linux-core
parent690dd04d1b9a4da92139793d3f5129a80f9c7353 (diff)
patch from -mm kernel to use upper_32_bits
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i915_compat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/i915_compat.c b/linux-core/i915_compat.c
index e119a992..58fb8418 100644
--- a/linux-core/i915_compat.c
+++ b/linux-core/i915_compat.c
@@ -84,7 +84,8 @@ static void intel_i965_g33_setup_chipset_flush(struct pci_dev *pdev)
intel_alloc_chipset_flush_resource(pdev);
- pci_write_config_dword(pdev, I965_IFPADDR + 4, (i9xx_private.ifp_resource.start >> 32));
+ pci_write_config_dword(pdev, I965_IFPADDR + 4,
+ upper_32_bits(i9xx_private.ifp_resource.start));
pci_write_config_dword(pdev, I965_IFPADDR, (i9xx_private.ifp_resource.start & 0xffffffff) | 0x1);
} else {
u64 l64;