summaryrefslogtreecommitdiff
path: root/recipes/linux
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-23 12:15:27 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-23 12:15:27 +0200
commit4c312174e1b1419e47f3b2d644926a7c985e4312 (patch)
tree3e57af3502ec0b6703dd85c2a54b9a3692ed1957 /recipes/linux
parent2747c78c7c545a1188cfb255603f20e8ebf67475 (diff)
parent4a9cec9c1a5e585dbc56f5aa0000488313e25338 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-2.6.24/hipox/defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 7f4dbdde5e..76d2b689ca 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24.4
-# Mon Apr 20 12:29:34 2009
+# Tue Apr 21 08:57:22 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -287,7 +287,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=" debug "
# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
#
# Floating point emulation