aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-03-27 13:22:32 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-28 17:39:00 +0000
commit42c0eba4fac6b8bd28b58ec04574d04b0ab0c457 (patch)
tree5367f3936c29a57528b36ef0dbce23adf21b96c2 /meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
parent821b1c03db3793609e3ae564358de10e23591604 (diff)
downloadopenembedded-core-42c0eba4fac6b8bd28b58ec04574d04b0ab0c457.tar.gz
linux-yocto/3.10: fix drm build failure
Andrea Adami reported the following build failure: .../drm/drm_mm.h:105:2: error: implicit declaration of function 'BUG_ON' [-Werror=implicit-function-declaration] | BUG_ON(!hole_node->hole_follows); | ^ | CC drivers/pci/setup-res.o | CC drivers/gpu/drm/i915/i915_drv.o | cc1: some warnings being treated as errors | make[6]: *** [drivers/gpu/drm/ttm/ttm_agp_backend.o] Error 1 | make[5]: *** [drivers/gpu/drm/ttm] Error 2 Cherry picking mainline commit 86e81f0e6 [drm/mm: include required headers in drm_mm.h] fixes the build problems. cc: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index 9b0c5d3e23..fe6773a5ec 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
KBRANCH = "standard/preempt-rt/base"
KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
-SRCREV_machine ?= "f121a3aa028df37b8050779adaa239d29aaa2edd"
-SRCREV_machine_qemuppc ?= "7172d3cbc73584e724b61ef5d13fc3519720f4c0"
+SRCREV_machine ?= "f4351616572c6ad5a8b71b1becf02c3e779b85b8"
+SRCREV_machine_qemuppc ?= "a6dfc85e99633d739068a03d2551e39847628551"
SRCREV_meta ?= "df3aa753c8826127fb5ad811d56d57168551d6e4"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"