diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-12 02:22:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 02:22:25 -0400 |
| commit | f46e374c1ea7fafce70a838f09fbd67de3e4d49f (patch) | |
| tree | e191e5316bdb8558bd3e2b0981c715bedd225ca7 /arch/arm/configs/mxs_defconfig | |
| parent | a4d3621e0d3ecf191961dc9214e4a378a7186780 (diff) | |
| parent | eb8ca943bae2b84c3fc14dfd7a908cb334465fef (diff) | |
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: marzen: enable thermal sensor
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: add SDHI0 support
+ sync to 3.6-rc4
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 | |||
| 34 | CONFIG_HIGH_RES_TIMERS=y | 34 | CONFIG_HIGH_RES_TIMERS=y |
| 35 | CONFIG_PREEMPT_VOLUNTARY=y | 35 | CONFIG_PREEMPT_VOLUNTARY=y |
| 36 | CONFIG_AEABI=y | 36 | CONFIG_AEABI=y |
| 37 | CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 | ||
| 38 | CONFIG_AUTO_ZRELADDR=y | 37 | CONFIG_AUTO_ZRELADDR=y |
| 39 | CONFIG_FPE_NWFPE=y | 38 | CONFIG_FPE_NWFPE=y |
| 40 | CONFIG_NET=y | 39 | CONFIG_NET=y |