diff options
| author | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
|---|---|---|
| committer | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
| commit | 6ef83e1cb65080174a888faef3a0791158f10ee4 (patch) | |
| tree | 6b028d3ab33c369284f41614d1c14aef8994c2cc /meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend | |
| parent | accc04b57bb68da4542bcecd49d95dcb03efd909 (diff) | |
| parent | 185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de (diff) | |
| download | meta-intel-6ef83e1cb65080174a888faef3a0791158f10ee4.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Conflicts:
common/recipes-kernel/linux/linux-yocto_3.10.bbappend
Diffstat (limited to 'meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend')
| -rw-r--r-- | meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend index ec67460a..50f8561c 100644 --- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
| @@ -3,13 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
| 3 | 3 | ||
| 4 | COMPATIBLE_MACHINE_nuc = "nuc" | 4 | COMPATIBLE_MACHINE_nuc = "nuc" |
| 5 | KMACHINE_nuc = "chiefriver" | 5 | KMACHINE_nuc = "chiefriver" |
| 6 | KBRANCH_nuc = "standard/common-pc-64/chiefriver" | 6 | KBRANCH_nuc = "standard/base" |
| 7 | 7 | ||
| 8 | KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" | 8 | KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" |
| 9 | 9 | ||
| 10 | LINUX_VERSION = "3.10.19" | 10 | LINUX_VERSION = "3.10.34" |
| 11 | 11 | ||
| 12 | SRCREV_meta_nuc = "d9cd83c0292bd4e2a6754a96761027252e726a42" | 12 | SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
| 13 | SRCREV_machine_nuc = "a9ec82e355130160f9094e670bd5be0022a84194" | 13 | SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
| 14 | 14 | ||
| 15 | module_autoload_iwlwifi_nuc = "iwlwifi" | 15 | module_autoload_iwlwifi_nuc = "iwlwifi" |