diff options
| author | John Klug <john.klug@multitech.com> | 2022-07-29 09:41:38 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2022-07-29 09:41:38 -0500 |
| commit | 7ceadd4adfbc52a434d9fbd6fedf7064cd957a36 (patch) | |
| tree | 2b055f187d97eccac77a0fc7a49e1c976244e06d | |
| parent | a4bf560211ce33109c3ca7cff0cddb6f9da864e3 (diff) | |
| parent | 46b385955e0177cfbdebac23df7907f53e945d89 (diff) | |
| download | meta-multitech-atmel-7ceadd4adfbc52a434d9fbd6fedf7064cd957a36.tar.gz meta-multitech-atmel-7ceadd4adfbc52a434d9fbd6fedf7064cd957a36.tar.bz2 meta-multitech-atmel-7ceadd4adfbc52a434d9fbd6fedf7064cd957a36.zip | |
Merge branch 'ym/fix_merge_conflict_mtre.conf' into '6'
Fix merge conflict in the mtre.conf file
See merge request !25
| -rw-r--r-- | conf/machine/mtre.conf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/conf/machine/mtre.conf b/conf/machine/mtre.conf index 8405351..57cfdde 100644 --- a/conf/machine/mtre.conf +++ b/conf/machine/mtre.conf @@ -6,11 +6,7 @@ require conf/machine/include/tune-arm926ejs.inc MACHINE_FEATURES = "ext2 ext3 usbhost usbgadget ppp" PREFERRED_PROVIDER_virtual/kernel = "linux-at91" -<<<<<<< HEAD -PREFERRED_VERSION_linux = "4.9.%" -======= PREFERRED_VERSION_linux-at91 = "5.4.81" ->>>>>>> b5b1fc2... mLinux 6 current preferred kernel is 5.4.81 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "kernel-module-vizzini" PREFERRED_VERSION_kernel-module-vizzini ?= "1.1" |