diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-09-23 14:35:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-09-29 23:44:55 +0200 |
| commit | 3870681ff63236659cda220c00b4d87ecac196f0 (patch) | |
| tree | 962a735f3d54e8c7cf2be32c8b0544c30d2a19a6 /recipes/linux/linux | |
| parent | 7a54b54c10da1e57ef5fd965f5b27a8489aaa994 (diff) | |
| download | openembedded-3870681ff63236659cda220c00b4d87ecac196f0.tar.gz | |
linux(-kexecboot)_git: bump SRCREV for 2.6.36-rc6
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux/linux')
| -rw-r--r-- | recipes/linux/linux/spitz/defconfig | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig index 52733cf648..c6f937f61d 100644 --- a/recipes/linux/linux/spitz/defconfig +++ b/recipes/linux/linux/spitz/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.36-rc2 -# Tue Aug 24 10:23:15 2010 +# Linux kernel version: 2.6.36-rc6 +# Wed Sep 29 22:09:30 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -293,9 +293,9 @@ CONFIG_PXA_SHARPSL=y # CONFIG_MACH_CORGI is not set # CONFIG_MACH_SHEPHERD is not set # CONFIG_MACH_HUSKY is not set -# CONFIG_MACH_AKITA is not set +CONFIG_MACH_AKITA=y CONFIG_MACH_SPITZ=y -# CONFIG_MACH_BORZOI is not set +CONFIG_MACH_BORZOI=y # CONFIG_MACH_TOSA is not set # CONFIG_MACH_ICONTROL is not set # CONFIG_ARCH_PXA_ESERIES is not set @@ -399,7 +399,6 @@ CONFIG_CMDLINE=" quiet " CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y # CONFIG_AUTO_ZRELADDR is not set -CONFIG_ZRELADDR=0xa0008000 # # CPU Power Management @@ -2278,7 +2277,7 @@ CONFIG_CRYPTO_RNG2=m CONFIG_CRYPTO_PCOMP2=m CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=m -CONFIG_CRYPTO_MANAGER_TESTS=y +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_WORKQUEUE=m |