Skip to content

M
meta-elphel393
Commit 530f9049 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

one more merge fix

parent 7a802596
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
conf/machine/include/machine-xilinx-default.inc
View file @ 530f9049
...@@ -8,7 +8,7 @@ IMAGE_CLASSES += "image_types_uboot" ...@@ -8,7 +8,7 @@ IMAGE_CLASSES += "image_types_uboot"
# Kernel Configuration # Kernel Configuration
PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
PREFERRED_VERSION_linux-xlnx ?= "3.10%" PREFERRED_VERSION_linux-xlnx ?= "3.10%"
<<<<<<< HEAD
# U-Boot Configuration # U-Boot Configuration
#PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" #PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment