diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-09 13:05:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-09 13:05:15 -0700 |
| commit | 5497e7b8967118ee45f8ef2d301fce919a35d660 (patch) | |
| tree | ef4633712579d9a06fce69c0748580fe05ca19ab /arch/arm/mach-spear | |
| parent | 8cbc95ee748741939222c3d38584a40c92bedcdd (diff) | |
| parent | eb16d33273532533400cb95189aa50d6b734db57 (diff) | |
| download | linux-stable-5497e7b8967118ee45f8ef2d301fce919a35d660.tar.gz linux-stable-5497e7b8967118ee45f8ef2d301fce919a35d660.tar.bz2 linux-stable-5497e7b8967118ee45f8ef2d301fce919a35d660.zip | |
Merge branch 'late/fixes' into fixes
* late/fixes:
ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
ARM: ux500: always select ABX500_CORE
ARM: SIRF: select SMP_ON_UP only on SMP builds
ARM: SPEAr: conditionalize l2x0 support
ARM: imx: build CPU suspend code only when needed
ARM: OMAP: build SMP code only for OMAP4/5
ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
ARM: default machine descriptor for multiplatform
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-spear')
| -rw-r--r-- | arch/arm/mach-spear/spear13xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c index 3621599c38ad..7aa6e8cf830f 100644 --- a/arch/arm/mach-spear/spear13xx.c +++ b/arch/arm/mach-spear/spear13xx.c @@ -35,6 +35,8 @@ void __init spear13xx_l2x0_init(void) * write alloc and 'Full line of zero' options * */ + if (!IS_ENABLED(CONFIG_CACHE_L2X0)) + return; writel_relaxed(0x06, VA_L2CC_BASE + L2X0_PREFETCH_CTRL); |