[linux-yocto] [PATCH 2/3] meta: fri2 - fix mixed emgd versions problem

[tom.zanussi at intel.com]

From: Tom Zanussi <tom.zanussi at intel.com>

The fri2 BSP includes the emgd-1.10 feature but merges the emgd-1.8
branch.  This change merges the 1.10 emgd branch as intended, and
removes the feature include, which is no longer needed since it's done
automatically now via a staging feature.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
index 28f142e..a42f1b5 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
@@ -5,8 +5,7 @@ define KARCH i386
 include ktypes/standard
 branch fri2
 
-include features/emgd/emgd-1.10.scc
-git merge emgd
+git merge emgd-1.10
 
 include fri2.scc
 include cfg/efi-ext.scc
-- 
1.7.4.1