summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-openmoko-2.6.34_git.bb
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2010-07-14 16:18:21 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2010-07-14 16:18:21 +0400
commitaddca691de9e974d574d75fef91ceb4a1e60b921 (patch)
tree7654ff11b82bf62008bc26a49c90eb5fcb1bc31c /recipes/linux/linux-openmoko-2.6.34_git.bb
parent10fabfa670e4e49a9c9a025d94a87ef0d9c86cc0 (diff)
parentb4cdc30178c0b506e25d706a5371e417deb82ce8 (diff)
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux-openmoko-2.6.34_git.bb')
-rw-r--r--recipes/linux/linux-openmoko-2.6.34_git.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
index 5ba2196ce8..6b21e01a0d 100644
--- a/recipes/linux/linux-openmoko-2.6.34_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -3,8 +3,8 @@ require linux-openmoko.inc
KERNEL_RELEASE="2.6.34"
-SRCREV = "4ce5f33cd4bcde2e25d50ae0880eb39213e2b6d2"
-OEV = "oe4.2"
+SRCREV = "3f6725d43021d2d7597027e36020df5b44d0667e"
+OEV = "oe4.3"
PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
SRC_URI = "\
@@ -29,8 +29,6 @@ SRC_URI = "\
file://0002-usbhost.patch.patch \
file://0003-ar6000_delay.patch.patch \
file://0004-save_regs.patch.patch \
-# possible resume fix
- file://0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch \
file://defconfig \
"