diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/arm/configs/omap_4430sdp_defconfig | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/arm/configs/omap_4430sdp_defconfig')
| -rw-r--r-- | arch/arm/configs/omap_4430sdp_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig index 7ac3fbf0fe04..a96bca290cd1 100644 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ b/arch/arm/configs/omap_4430sdp_defconfig | |||
| @@ -242,10 +242,13 @@ CONFIG_CPU_CP15_MMU=y | |||
| 242 | # CONFIG_CPU_DCACHE_DISABLE is not set | 242 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 243 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 243 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
| 244 | CONFIG_HAS_TLS_REG=y | 244 | CONFIG_HAS_TLS_REG=y |
| 245 | CONFIG_OUTER_CACHE=y | ||
| 246 | CONFIG_CACHE_L2X0=y | ||
| 245 | CONFIG_ARM_L1_CACHE_SHIFT=5 | 247 | CONFIG_ARM_L1_CACHE_SHIFT=5 |
| 246 | # CONFIG_ARM_ERRATA_430973 is not set | 248 | # CONFIG_ARM_ERRATA_430973 is not set |
| 247 | # CONFIG_ARM_ERRATA_458693 is not set | 249 | # CONFIG_ARM_ERRATA_458693 is not set |
| 248 | # CONFIG_ARM_ERRATA_460075 is not set | 250 | # CONFIG_ARM_ERRATA_460075 is not set |
| 251 | CONFIG_PL310_ERRATA_588369=y | ||
| 249 | CONFIG_ARM_GIC=y | 252 | CONFIG_ARM_GIC=y |
| 250 | 253 | ||
| 251 | # | 254 | # |