summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-09-10 00:04:58 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-15 11:21:04 +0100
commit4ab79c8e02f9fe7a02c56019d5b169ad4f0e3aec (patch)
tree3f9b6eef2ad729c344f5608a5f7a3616fe4beeab /meta
parenta1ab7c5e03df97e630dfee470ff7959d3143bf41 (diff)
downloadopenembedded-core-4ab79c8e02f9fe7a02c56019d5b169ad4f0e3aec.tar.gz
openembedded-core-4ab79c8e02f9fe7a02c56019d5b169ad4f0e3aec.tar.bz2
openembedded-core-4ab79c8e02f9fe7a02c56019d5b169ad4f0e3aec.tar.xz
openembedded-core-4ab79c8e02f9fe7a02c56019d5b169ad4f0e3aec.zip
linux-yocto: split e100 and e1000 support
Merging the following meta changes: 12574e5 meta: create seperate feature for 10/100 LAN support c8b37bf meta: Remove 10/100 LAN support. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index ebf60546c..36717d6bb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
-SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
+SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index b2965582b..4b1bdb241 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
-SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
+SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"