diff options
| author | George Nita <george.nita@enea.com> | 2014-05-01 03:26:20 (GMT) |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2014-05-01 03:26:20 (GMT) |
| commit | 5d093e6f841cc82f072fd1b19573628392ca640a (patch) | |
| tree | 8ff0499e7acbd5f3ad70d5db8010e5fc34fdfa0a /meta-fri2/recipes-kernel | |
| parent | df9561721a075c978eebf73a8ee5acd02e95fc73 (diff) | |
| parent | 6ae8765812590327df5f2843b5542750a851d1bd (diff) | |
| download | meta-intel-5d093e6f841cc82f072fd1b19573628392ca640a.tar.gz | |
Merge remote-tracking branch 'origin/daisy' into daisy-eneav4.0-rc1enea-linux-4.0-rc1
Diffstat (limited to 'meta-fri2/recipes-kernel')
| -rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend index 7098bac..c022966 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
| @@ -5,7 +5,7 @@ KMACHINE_fri2-noemgd = "fri2" | |||
| 5 | KBRANCH_fri2-noemgd = "standard/fri2" | 5 | KBRANCH_fri2-noemgd = "standard/fri2" |
| 6 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | 6 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" |
| 7 | LINUX_VERSION_fri2-noemgd = "3.14.0" | 7 | LINUX_VERSION_fri2-noemgd = "3.14.0" |
| 8 | SRCREV_machine_fri2-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 8 | SRCREV_machine_fri2-noemgd = "144595ef6215a0febfb8ee7d0c9e4eb2eaf93d61" |
| 9 | SRCREV_meta_fri2-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | 9 | SRCREV_meta_fri2-noemgd = "ad5f23c47b299418a88f13b1e6f119602115804a" |
| 10 | 10 | ||
| 11 | module_autoload_iwlwifi = "iwlwifi" | 11 | module_autoload_iwlwifi = "iwlwifi" |