diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
| commit | 3c1f67d60e2b4f4455563928999fd41cc653645d (patch) | |
| tree | 0d58c145a05fb09167f1ab6882b474eccb1f3563 /arch/blackfin/configs/BlackStamp_defconfig | |
| parent | lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| download | linux-3c1f67d60e2b4f4455563928999fd41cc653645d.tar.xz linux-3c1f67d60e2b4f4455563928999fd41cc653645d.zip | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'arch/blackfin/configs/BlackStamp_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BlackStamp_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig index 3a20e281d23c..017c6ea071b5 100644 --- a/arch/blackfin/configs/BlackStamp_defconfig +++ b/arch/blackfin/configs/BlackStamp_defconfig @@ -288,8 +288,8 @@ CONFIG_BFIN_ICACHE=y CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set # CONFIG_BFIN_ICACHE_LOCK is not set -# CONFIG_BFIN_WB is not set -CONFIG_BFIN_WT=y +CONFIG_BFIN_WB=y +# CONFIG_BFIN_WT is not set # CONFIG_MPU is not set # |