diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-01 10:08:15 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-01 10:08:15 (GMT) |
| commit | 177f72fd101d512d938558b53cd4faa6a5434090 (patch) | |
| tree | 1cfe58343c705f02c53886d7aa781b97b671b704 /arch/arm/mm/Kconfig | |
| parent | 761bfdd91184c6662a9233976e855b4ccb883c96 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| download | linux-fsl-qoriq-177f72fd101d512d938558b53cd4faa6a5434090.tar.xz | |
Merge tag 'v3.3-rc2' into for-3.4
A reasonable amount of new development is causing fiddly merge conflicts
between different resource management changes (mostly fixing bugs in
resource management due to noticing things while doing enhancements in
the same area).
Linux 3.3-rc2
.. several days delayed. No reason, I just didn't think of it.
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 4cefb57..1a3ca24 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -882,6 +882,7 @@ config CACHE_XSC3L2 config ARM_L1_CACHE_SHIFT_6 bool + default y if CPU_V7 help Setting ARM L1 cache line size to 64 Bytes. |