diff options
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 4 |
1 files changed, 4 insertions, 0 deletions
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 2c16efa10b..024af30b04 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 | |||
| @@ -6,6 +6,10 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) | |||
| 6 | {{ if need_new_kbranch == "y": }} | 6 | {{ if need_new_kbranch == "y": }} |
| 7 | branch {{=machine}} | 7 | branch {{=machine}} |
| 8 | 8 | ||
| 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | ||
| 10 | include features/emgd/emgd-1.10.scc | ||
| 11 | git merge emgd-1.10 | ||
| 12 | |||
| 9 | include {{=machine}}.scc | 13 | include {{=machine}}.scc |
| 10 | 14 | ||
| 11 | # default policy for standard kernels | 15 | # default policy for standard kernels |