diff options
author | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
commit | fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc (patch) | |
tree | 1a22b4521591d980819dcd0d90b7964f8d6b1a32 /common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | |
parent | 6ef83e1cb65080174a888faef3a0791158f10ee4 (diff) | |
parent | b26946e8e7f1f3bb68625731b493156309449f5d (diff) | |
download | meta-intel-fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend index cfb41930..f4712ef8 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | |||
@@ -14,6 +14,6 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | |||
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | #SRCREV_meta_corei7-64-intel-common = "${AUTOREV}" | 15 | #SRCREV_meta_corei7-64-intel-common = "${AUTOREV}" |
16 | #SRCREV_machine_corei7-64-intel-common = "${AUTOREV}" | 16 | #SRCREV_machine_corei7-64-intel-common = "${AUTOREV}" |
17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
18 | KBRANCH_intel-corei7-64-intel-common = "standard/preempt-rt/base" | 18 | KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |