diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 22:31:13 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 22:31:13 -0400 |
| commit | 60e677bfffd835ef56d8a2f25f9a2f8eaa8f2b7c (patch) | |
| tree | f08c3de386ee6289abbb1a7180c06f6c7c67a2c7 /arch/x86/kernel/aperture_64.c | |
| parent | fbd46dc5333e0bc45719a7ed38d3411aef7dcd61 (diff) | |
| parent | 60584ef99395a89d136399bbc127289a4aa29dc7 (diff) | |
Merge commit 'v2.6.38.5' into linaro-2.6.38
Diffstat (limited to 'arch/x86/kernel/aperture_64.c')
| -rw-r--r-- | arch/x86/kernel/aperture_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index 5955a7800a9..f6a1c2395b5 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c @@ -500,7 +500,7 @@ out: * Don't enable translation yet but enable GART IO and CPU * accesses and set DISTLBWALKPRB since GART table memory is UC. */ - u32 ctl = DISTLBWALKPRB | aper_order << 1; + u32 ctl = aper_order << 1; bus = amd_nb_bus_dev_ranges[i].bus; dev_base = amd_nb_bus_dev_ranges[i].dev_base; |