diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-10 18:23:27 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-10 18:23:27 +0000 |
| commit | b53712cf39bc79a7b9f873861c65270d3e15f6fc (patch) | |
| tree | f098830baf2c5771ef17103e55fe7086baced0b2 /packages/linux | |
| parent | 501cb780ac89508e8b5592e40977b789b5e0a1ef (diff) | |
| parent | 7fba1b3f2708865f7a0d60b0472d5ab84b85cfdd (diff) | |
merge of '046b893ab8fe9a75380cca2843abba168e1dc148'
and '3601dddeaadc9f1eec11df4baadff513d463bbe4'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 | 1 | ||||
| -rw-r--r-- | packages/linux/linux-ixp4xx_2.6.24.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 index 28b69a82ed..061c0c0724 100644 --- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 +++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 @@ -243,6 +243,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE=" noirqdebug console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # Floating point emulation diff --git a/packages/linux/linux-ixp4xx_2.6.24.bb b/packages/linux/linux-ixp4xx_2.6.24.bb index 9942433b56..9a5967afa2 100644 --- a/packages/linux/linux-ixp4xx_2.6.24.bb +++ b/packages/linux/linux-ixp4xx_2.6.24.bb @@ -11,7 +11,7 @@ KERNEL_RELEASE = "2.6.24" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ |