diff options
author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-15 18:02:16 +0530 |
---|---|---|
committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-15 18:02:16 +0530 |
commit | 02e50de423e1f44158a01bfd59f00cd37d31ba5b (patch) | |
tree | 73d4f47239c741ff98ccc392fe48b745be20d46c /arch | |
parent | 65d462bc697dbb55da2db7c3ba2045811a9454b4 (diff) | |
parent | 21cc82b575b16307184369646e98afc1116f6db9 (diff) |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/net/wireless/bcm4329/Makefile
Change-Id: I13ed89657bb43ac906c6424372050df5fd681374
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 3baccca70ed6..d09ff3b13b54 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -99,8 +99,9 @@ void __init tegra_init_cache(void) writel(0x331, p + L2X0_TAG_LATENCY_CTRL); writel(0x441, p + L2X0_DATA_LATENCY_CTRL); + writel(7, p + L2X0_PREFETCH_OFFSET); - l2x0_init(p, 0x6C480001, 0x8200c3fe); + l2x0_init(p, 0x7C480001, 0x8200c3fe); #endif } |