diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-12-31 20:37:33 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-12-31 20:37:33 +0100 |
| commit | 5cc693a438ef826c10f46337c100dfda785be66f (patch) | |
| tree | a5562313c9262b16a71f3eef93598f1ef13bab29 /recipes/linux | |
| parent | 5c32410cd61bf46018d6af581984b25964962254 (diff) | |
| parent | 1e7c93e555fb8c63a2e1baa334cf72f9c9dabfad (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-2.6.31/qemux86/defconfig | 2 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.27.bb | 4 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.31.bb | 4 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.32.bb | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/recipes/linux/linux-2.6.31/qemux86/defconfig b/recipes/linux/linux-2.6.31/qemux86/defconfig index 3137af0c5e..395258c430 100644 --- a/recipes/linux/linux-2.6.31/qemux86/defconfig +++ b/recipes/linux/linux-2.6.31/qemux86/defconfig @@ -1149,7 +1149,7 @@ CONFIG_E100=m CONFIG_FEALNX=m CONFIG_NATSEMI=m CONFIG_NE2K_PCI=y -# CONFIG_8139CP is not set +CONFIG_8139CP=y CONFIG_8139TOO=y CONFIG_8139TOO_PIO=y # CONFIG_8139TOO_TUNE_TWISTER is not set diff --git a/recipes/linux/linux_2.6.27.bb b/recipes/linux/linux_2.6.27.bb index 9e8d6a32e0..02f32dc46c 100644 --- a/recipes/linux/linux_2.6.27.bb +++ b/recipes/linux/linux_2.6.27.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r11" +PR = "r12" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_progear = "1" DEFAULT_PREFERENCE_simpad = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.41.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.42.bz2;patch=1 \ file://defconfig " SRC_URI_append_boc01 = "\ diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index dcce779ebd..f5dd79b6c9 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r8" +PR = "r9" S = "${WORKDIR}/linux-${PV}" @@ -16,7 +16,7 @@ DEFAULT_PREFERENCE_ben-nanonote = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.8.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.9.bz2;patch=1 \ file://defconfig" SRC_URI += "file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch;patch=1 \ diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb index be3d8ad7c6..a7861af17c 100644 --- a/recipes/linux/linux_2.6.32.bb +++ b/recipes/linux/linux_2.6.32.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r2" +PR = "r3" S = "${WORKDIR}/linux-${PV}" @@ -15,7 +15,7 @@ DEFAULT_PREFERENCE_spitz = "-1" DEFAULT_PREFERENCE_tosa = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.2.bz2;patch=1 \ file://defconfig" SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879" |