From d7f436e161eb8356a11a99d08649e3516c78a3a5 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 16 Jun 2016 00:18:21 +0000
Subject: [PATCH] core/linux-odroid-xu3 to 3.10.96-6

---
 core/linux-odroid-xu3/PKGBUILD | 11 +++++++----
 core/linux-odroid-xu3/config   |  9 +++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/linux-odroid-xu3/PKGBUILD b/core/linux-odroid-xu3/PKGBUILD
index 6c0848c4a..17e9802e5 100644
--- a/core/linux-odroid-xu3/PKGBUILD
+++ b/core/linux-odroid-xu3/PKGBUILD
@@ -4,12 +4,12 @@
 buildarch=4
 
 pkgbase=linux-odroid-xu3
-_commit=acd35659d66efc81387f494d833ca5cb63b4ca9f
+_commit=ae5b5f99f06f936382edda30522787bdde1248bd
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="ODROID-XU3"
 pkgver=3.10.96
-pkgrel=5
+pkgrel=6
 arch=('armv7h')
 url="https://github.com/hardkernel/linux"
 license=('GPL2')
@@ -17,8 +17,8 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
         'config')
-md5sums=('dfa08fe6406fa40f32a9b618b12c92e2'
-         'af459977c85028dab014707a5fac6767')
+md5sums=('3c02ec6f384ea70aaf000a6fd99f04ba'
+         'df97c8caa1791d330a38e22f04b7a9e0')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -30,6 +30,9 @@ prepare() {
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
+
+  # GCC 6 compatibility hack
+  cp include/linux/compiler-gcc5.h include/linux/compiler-gcc6.h
 }
 
 build() {
diff --git a/core/linux-odroid-xu3/config b/core/linux-odroid-xu3/config
index 1a0d97f05..7bbd41c06 100644
--- a/core/linux-odroid-xu3/config
+++ b/core/linux-odroid-xu3/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.96-5 Kernel Configuration
+# Linux/arm 3.10.96-6 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1692,7 +1692,7 @@ CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
@@ -2680,11 +2680,8 @@ CONFIG_DRM_EXYNOS_DP=y
 CONFIG_DRM_EXYNOS_HDMI=y
 # CONFIG_DRM_EXYNOS_VIDI is not set
 # CONFIG_DRM_EXYNOS_G2D is not set
-CONFIG_DRM_EXYNOS_IPP=y
+# CONFIG_DRM_EXYNOS_IPP is not set
 CONFIG_DRM_EXYNOS_EXPERIMENTAL_VSYNC=y
-# CONFIG_DRM_EXYNOS_FIMC is not set
-CONFIG_DRM_EXYNOS_ROTATOR=y
-CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_ARMADA is not set
 # CONFIG_DRM_TILCDC is not set