From d04db84795a37d8d5113cead9850492265a0f336 Mon Sep 17 00:00:00 2001
From: Shaun Mulligan <shaun@resin.io>
Date: Sun, 10 Dec 2017 17:43:08 +0100
Subject: [PATCH] small fix ups for merge
---
layers/meta-resin-allwinner/conf/samples/conf-notes.txt | 1 +
.../recipes-kernel/linux/linux_4.11%.bbappend | 1 +
2 files changed, 2 insertions(+)
diff --git a/layers/meta-resin-allwinner/conf/samples/conf-notes.txt b/layers/meta-resin-allwinner/conf/samples/conf-notes.txt
index b92359a..9548212 100644
--- a/layers/meta-resin-allwinner/conf/samples/conf-notes.txt
+++ b/layers/meta-resin-allwinner/conf/samples/conf-notes.txt
@@ -13,3 +13,4 @@ Resin specific targets are:
Nanopi Neo Air (EXPERIMENTAL) : $ MACHINE=nanopi-neo-air bitbake resin-image
Orange Pi Lite (EXPERIMENTAL) : $ MACHINE=orange-pi-lite bitbake resin-image
+
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux_4.11%.bbappend b/layers/meta-resin-allwinner/recipes-kernel/linux/linux_4.11%.bbappend
index 6f67d44..0825a2b 100644
--- a/layers/meta-resin-allwinner/recipes-kernel/linux/linux_4.11%.bbappend
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux/linux_4.11%.bbappend
@@ -26,6 +26,7 @@ SRC_URI_append = " \
file://scripts-dtc-import-updates.patch \
file://spidev-remove-warnings.patch \
file://spi-sun6i-allow-large-transfers.patch \
+"
SRC_URI_append_orange-pi-lite = " \
file://add-realtek-8189fs-driver.patch \