diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-04 15:33:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-04 15:33:22 -0800 |
| commit | 5958eed76ccc8c361f872829bdc4b8c6dc9cd379 (patch) | |
| tree | 8f8dfcced082db674b0ae3ca3af9fdb6dde59dae /arch/blackfin/configs/IP0X_defconfig | |
| parent | c7c17c2779075e675cb3c7fe2ecde67e226771fb (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
| download | kernel-crypto-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.gz kernel-crypto-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.xz kernel-crypto-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/blackfin/configs/IP0X_defconfig')
| -rw-r--r-- | arch/blackfin/configs/IP0X_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig index 1ec9ae2e964..a7e49d63122 100644 --- a/arch/blackfin/configs/IP0X_defconfig +++ b/arch/blackfin/configs/IP0X_defconfig @@ -68,6 +68,7 @@ CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set +CONFIG_MMAP_ALLOW_UNINITIALIZED=y CONFIG_RT_MUTEXES=y CONFIG_TINY_SHMEM=y CONFIG_BASE_SMALL=0 @@ -261,6 +262,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_LARGE_ALLOCS=y +CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0 # CONFIG_BFIN_GPTIMERS is not set # CONFIG_DMA_UNCACHED_2M is not set CONFIG_DMA_UNCACHED_1M=y |