diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
| commit | 54d69df5849ec2e660aa12ac75562618c10fb499 (patch) | |
| tree | adbfb8bcc7cc73b83bf2b784fa331911ba03573a /arch/arm/configs/kzm9g_defconfig | |
| parent | ad932bb6b549722a561fb31ac2fa50dcbcb3e36b (diff) | |
| parent | 46f2007c1efadfa4071c17e75f140c47f09293de (diff) | |
Merge branch 'late/kirkwood' into late/soc
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.
Final contents described in shared tag.
Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/kzm9g_defconfig')
| -rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 2388c8610627..5d0c66708960 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig | |||
| @@ -14,6 +14,7 @@ CONFIG_NAMESPACES=y | |||
| 14 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 14 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 15 | CONFIG_SYSCTL_SYSCALL=y | 15 | CONFIG_SYSCTL_SYSCALL=y |
| 16 | CONFIG_EMBEDDED=y | 16 | CONFIG_EMBEDDED=y |
| 17 | CONFIG_PERF_EVENTS=y | ||
| 17 | CONFIG_SLAB=y | 18 | CONFIG_SLAB=y |
| 18 | CONFIG_MODULES=y | 19 | CONFIG_MODULES=y |
| 19 | CONFIG_MODULE_FORCE_LOAD=y | 20 | CONFIG_MODULE_FORCE_LOAD=y |