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-dev.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-dev.bbappend')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-dev.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index 45b6873a..4fe4088b 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
| @@ -14,6 +14,6 @@ LINUX_VERSION_corei7-64-intel-common = "3.14-rc8" | |||
| 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
| 15 | SRCREV_meta_corei7-64-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020" | 15 | SRCREV_meta_corei7-64-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020" |
| 16 | SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c" | 16 | SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c" |
| 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/base" | 18 | KBRANCH_corei7-64-intel-common = "standard/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}" |