diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-11-15 10:44:22 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-11-15 10:44:22 +0000 |
| commit | 528450f67d00cd3cad700d93cbe88bff666dea84 (patch) | |
| tree | 119422052188818eb8da2bcdf3bed73763d1a9ff /packages/linux | |
| parent | c01740ed8f1e0ad54311af8677210462df368046 (diff) | |
| parent | cd0d5e6081b0ea60ebfcf0b455a18d56c8c25e32 (diff) | |
merge of '7c5dba6a4cc7c7a653ff9454f9d2787304cdc736'
and 'a92b3f38a2b90eca4b4e230c498fbe32f7013525'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.19-rc5.bb | 2 | ||||
| -rw-r--r-- | packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb | 2 | ||||
| -rw-r--r-- | packages/linux/mx31ads-kernel_2.6.19rc5.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb index bfb9dccb80..8e2932b9ca 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "577" +IXP4XX_KERNEL_SVN_REV = "579" # # The directory containing the patches to be applied is # specified below diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb index 3df8b1af99..79592a84eb 100644 --- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb +++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for MNCI device" LICENSE = "GPL" DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}" -COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "mnci" KV = "2.4.21" RMKV = "2" PXAV = "1" diff --git a/packages/linux/mx31ads-kernel_2.6.19rc5.bb b/packages/linux/mx31ads-kernel_2.6.19rc5.bb index 1c3179bcfb..0957fe71fe 100644 --- a/packages/linux/mx31ads-kernel_2.6.19rc5.bb +++ b/packages/linux/mx31ads-kernel_2.6.19rc5.bb @@ -39,7 +39,7 @@ do_configure_prepend() { sed -e '/CONFIG_AEABI/d' \ -e '/CONFIG_OABI_COMPAT=/d' \ - '${WORKDIR}/defconfig' >>'${S}/.config' + '${S}/defconfig' >>'${S}/.config' # echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config |