diff options
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | 3 |
1 files changed, 1 insertions, 2 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 e34882f93d..1b22eab9ad 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 | |||
| @@ -7,8 +7,7 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) | |||
| 7 | branch {{=machine}} | 7 | branch {{=machine}} |
| 8 | 8 | ||
| 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} |
| 10 | include features/emgd/emgd-1.14.scc | 10 | include features/drm-emgd/emgd-1.16.scc |
| 11 | git merge emgd-1.14 | ||
| 12 | 11 | ||
| 13 | include {{=machine}}.scc | 12 | include {{=machine}}.scc |
| 14 | 13 | ||