2 files changed, 2 insertions, 8 deletions

diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc
index 1b22eab9ad..60b670dffc 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc
@@ -6,9 +6,6 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)
 {{ if need_new_kbranch == "y": }}
 branch {{=machine}}
 
-{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
-include features/drm-emgd/emgd-1.16.scc
-
 include {{=machine}}.scc
 
 # default policy for standard kernels
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
index 41e16355bf..eda1d62f11 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
@@ -3,16 +3,13 @@ kconf hardware {{=machine}}.cfg
 include features/intel-e1xxxx/intel-e100.scc
 include features/intel-e1xxxx/intel-e1xxxx.scc
 
-{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
-include features/drm-emgd/drm-emgd.scc
-
-{{ if xserver == "y" and xserver_choice == "xserver_i915": }}
+{{ if xserver == "y" and xserver_choice == "xserver_i915" or xserver_choice == "xserver_i965": }}
 include features/i915/i915.scc
 
 include features/serial/8250.scc
 include features/ericsson-3g/f5521gw.scc
 
-{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
+{{ if xserver == "y" and xserver_choice == "xserver_vesa": }}
 include cfg/vesafb.scc
 
 include cfg/usb-mass-storage.scc