diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:53:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:53:48 +0200 |
| commit | 1b984fbe0f21711975f80667f7e8b240e7848fd7 (patch) | |
| tree | 82309aada7533c925a10c2f9a522a807c761e9a6 /arch/arm/configs/mxs_defconfig | |
| parent | Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linu... (diff) | |
| parent | ARM: mxs: always build ocotp (diff) | |
| download | linux-1b984fbe0f21711975f80667f7e8b240e7848fd7.tar.xz linux-1b984fbe0f21711975f80667f7e8b240e7848fd7.zip | |
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
* 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: always build ocotp
ARM: mxs: Remove MMAP_MIN_ADDR setting from mxs_defconfig
ARM: mx28: Fix registers range
ARM: mx23: Fix registers range
Diffstat (limited to 'arch/arm/configs/mxs_defconfig')
| -rw-r--r-- | arch/arm/configs/mxs_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index ccdb6357fb74..4edcfb4e4dee 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -34,7 +34,6 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_AEABI=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_AUTO_ZRELADDR=y CONFIG_FPE_NWFPE=y CONFIG_NET=y |