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 /meta-emenlow/conf/machine/emenlow-noemgd.conf | |
| parent | 6ef83e1cb65080174a888faef3a0791158f10ee4 (diff) | |
| parent | b26946e8e7f1f3bb68625731b493156309449f5d (diff) | |
| download | meta-intel-fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'meta-emenlow/conf/machine/emenlow-noemgd.conf')
| -rw-r--r-- | meta-emenlow/conf/machine/emenlow-noemgd.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-emenlow/conf/machine/emenlow-noemgd.conf b/meta-emenlow/conf/machine/emenlow-noemgd.conf index f7b11e6e..d8e5a5e4 100644 --- a/meta-emenlow/conf/machine/emenlow-noemgd.conf +++ b/meta-emenlow/conf/machine/emenlow-noemgd.conf | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #@DESCRIPTION: Machine configuration for eMenlow based systems, like the Webs-2120 box, without the Intel-proprietary graphics bits | 6 | #@DESCRIPTION: Machine configuration for eMenlow based systems, like the Webs-2120 box, without the Intel-proprietary graphics bits |
| 7 | 7 | ||
| 8 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 8 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 9 | 9 | ||
| 10 | require conf/machine/include/intel-core2-32-common.inc | 10 | require conf/machine/include/intel-core2-32-common.inc |
| 11 | 11 | ||