From 4bb2e2f6b364ad05791810c5ecc8783c2cb777ce Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 8 Aug 2012 09:33:32 -0500 Subject: yocto-bsp: use emgd 1.14 for i386 template Make i386 template use emgd 1.14, along with associated changes. (From meta-yocto rev: 69f49f7e8370112164b70b9a5ae6f3c0e1ce0bfa) Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc') diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc index 024af30b04..c6f42db4cf 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc @@ -7,8 +7,8 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) branch {{=machine}} {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} -include features/emgd/emgd-1.10.scc -git merge emgd-1.10 +include features/emgd/emgd-1.14.scc +git merge emgd-1.14 include {{=machine}}.scc -- cgit v1.2.3-54-g00ecf