diff options
| author | Simon Horman <horms@verge.net.au> | 2012-11-08 03:49:35 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-11-08 03:49:35 -0500 |
| commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch) | |
| tree | 4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/configs | |
| parent | 631a7b5d958d2ef2c2333b105794c693642f0641 (diff) | |
| parent | 2944628607f76e4755660cd710f22a4748ef88d8 (diff) | |
Merge branch 'soc' into boards
Conflicts:
arch/arm/configs/marzen_defconfig
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index f78d259f8d23..3d764072dd54 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig | |||
| @@ -7,6 +7,7 @@ CONFIG_LOG_BUF_SHIFT=16 | |||
| 7 | # CONFIG_IPC_NS is not set | 7 | # CONFIG_IPC_NS is not set |
| 8 | # CONFIG_PID_NS is not set | 8 | # CONFIG_PID_NS is not set |
| 9 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 9 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 10 | CONFIG_PERF_EVENTS=y | ||
| 10 | CONFIG_SLAB=y | 11 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 12 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 13 | CONFIG_MODULE_UNLOAD=y |