diff options
| -rw-r--r-- | meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc | 3 | ||||
| -rw-r--r-- | meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc index aac1b09058a1..8ca54291fbc0 100644 --- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc +++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc @@ -5,6 +5,9 @@ define KARCH i386 include ktypes/standard branch emenlow +include features/emgd/emgd-1.10.scc +git merge emgd-1.10 + include emenlow.scc # default policy for standard kernels diff --git a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc index e69c0c51c8ed..4a3af993ea89 100644 --- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc +++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc @@ -3,7 +3,7 @@ kconf hardware emenlow.cfg kconf non-hardware reboot-quirk.cfg include features/intel-e1xxxx/intel-e100.scc include features/intel-e1xxxx/intel-e1xxxx.scc -include features/drm-psb/drm-psb.scc +include features/drm-emgd/drm-emgd.scc include features/serial/8250.scc include cfg/vesafb.scc include cfg/smp.scc |