diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-02-10 02:50:32 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-02-10 02:50:32 +0000 |
| commit | 3a5e610960e36d571ffaf39332a776c5e332e7e7 (patch) | |
| tree | ff26b8992696fce573b97e32e1e4f5d63b67b795 /packages/linux | |
| parent | 6c64ef3f168986a36f37a2a8d958f45ca5616ff0 (diff) | |
| parent | 9d9f69b80f99932db142fbb6fb59151c66befebb (diff) | |
merge of '93c92c2d118afa75e8263141e4da9395b50eea98'
and 'e59aa2cab1515e8858debb81984c8596f07ad7c0'
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 \ |