From 9ab61ebca51f6f74e16cb184535d121b6a1f7c7c Mon Sep 17 00:00:00 2001
From: Joseph Kogut <joseph.kogut@gmail.com>
Date: Wed, 9 Nov 2016 16:45:12 -0800
Subject: [PATCH] linux-odroid-c1: disable redundant ADS7846 module

The tree contains two modules for the ADS7846 touchscreen controller.
One from upstream, and one from the hardkernel patches. The HK
module only works when the upstream driver is not enabled, and it is
disabled in their config. It should be disabled here as well.
---
 core/linux-odroid-c1/PKGBUILD | 4 ++--
 core/linux-odroid-c1/config   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/linux-odroid-c1/PKGBUILD b/core/linux-odroid-c1/PKGBUILD
index 08c8ec247..384e291fa 100644
--- a/core/linux-odroid-c1/PKGBUILD
+++ b/core/linux-odroid-c1/PKGBUILD
@@ -9,7 +9,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="ODROID-C1"
 pkgver=3.10.104
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 url="https://github.com/hardkernel/linux"
 license=('GPL2')
@@ -21,7 +21,7 @@ source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
         'amlogic.service')
 md5sums=('b45d38bcbee0274806d130dc9ec1dc2a'
          'SKIP'
-         'af74c12b4fb562cf958f3810f7c0c788'
+         '5c0b1147cd8d1e43a0afb4283857a602'
          'b8956789318f49cec5b8bb0b41654a9b')
 
 prepare() {
diff --git a/core/linux-odroid-c1/config b/core/linux-odroid-c1/config
index f9b1a4938..fb2c2dbe4 100644
--- a/core/linux-odroid-c1/config
+++ b/core/linux-odroid-c1/config
@@ -2182,7 +2182,7 @@ CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
 CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m