diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /arch/blackfin/configs/BF561-ACVILON_defconfig | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'arch/blackfin/configs/BF561-ACVILON_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF561-ACVILON_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF561-ACVILON_defconfig b/arch/blackfin/configs/BF561-ACVILON_defconfig index 6a776ce75e9c..d5ceeab7a906 100644 --- a/arch/blackfin/configs/BF561-ACVILON_defconfig +++ b/arch/blackfin/configs/BF561-ACVILON_defconfig | |||
| @@ -330,7 +330,6 @@ CONFIG_SYS_BFIN_SPINLOCK_L1=y | |||
| 330 | CONFIG_CACHELINE_ALIGNED_L1=y | 330 | CONFIG_CACHELINE_ALIGNED_L1=y |
| 331 | # CONFIG_SYSCALL_TAB_L1 is not set | 331 | # CONFIG_SYSCALL_TAB_L1 is not set |
| 332 | # CONFIG_CPLB_SWITCH_TAB_L1 is not set | 332 | # CONFIG_CPLB_SWITCH_TAB_L1 is not set |
| 333 | CONFIG_APP_STACK_L1=y | ||
| 334 | 333 | ||
| 335 | # | 334 | # |
| 336 | # Speed Optimizations | 335 | # Speed Optimizations |