diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2007-03-09 21:38:52 +0000 |
|---|---|---|
| committer | Oyvind Repvik <nail@nslu2-linux.org> | 2007-03-09 21:38:52 +0000 |
| commit | 0930734e736aeb768e9ffe40271a78d0f5af510b (patch) | |
| tree | 98d20d1eda76abede78b111980d5c40ca916a050 /packages/linux | |
| parent | b6ae1290d940b748aea399d57506e7cb853980a2 (diff) | |
| parent | d5da9fdead78ced73cb0afa793dafb22c0dd86fd (diff) | |
merge of 'a3a6b606f8696b6f5cbfbee341c9dd0a91033a49'
and 'cc41b5c73fe6e7b86bf9d57e9eacc0a32e449782'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/ixp4xx-kernel.inc | 6 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.20.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-ezx_2.6.16.13.bb | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index b16c3d481d..1c9d004d0f 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -211,6 +211,12 @@ do_configure_prepend() { } + +# Kernel module dependencies + +RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware" + + # MACHID and LE handling # # This mach_fixup function adds the required prefix to the image to diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 94a08509a7..a2599d83b6 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20" # the changes in SVN between revisions include changes in the # patches applied to the kernel, rather than simply defconfig # changes -PR = "r2.${IXP4XX_KERNEL_SVN_REV}" +PR = "r3.${IXP4XX_KERNEL_SVN_REV}" require ixp4xx-kernel.inc require ixp4xx-kernel-svnpatch.inc diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index 2775a744d3..1e6d3e2506 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openezx.org" LICENSE = "GPL" DEPENDS += "quilt-native" EZX = "ezx9" -PR = "${EZX}-r1" +PR = "${EZX}-r2" inherit kernel @@ -20,7 +20,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ \ file://logo_linux_clut224.ppm \ file://defconfig-a780 \ - file://defconfig-e680" + file://defconfig-e680 \ + file://wyrm-ts.diff;patch=1" S = "${WORKDIR}/linux-2.6.16" ############################################################## |