diff options
Diffstat (limited to 'conf/machine')
| -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" |