From 088a278d88f494b180f139db846d80ed9e75cb46 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 19 May 2015 00:58:05 +0000
Subject: [PATCH] core/linux-armv7-rc to 4.1.rc4-1

---
 core/linux-armv7-rc/PKGBUILD |  8 ++++----
 core/linux-armv7-rc/config   | 28 +++++++++++++++++++---------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD
index 0da5a8fee..93f1f537e 100644
--- a/core/linux-armv7-rc/PKGBUILD
+++ b/core/linux-armv7-rc/PKGBUILD
@@ -4,7 +4,7 @@
 buildarch=4
 
 _rcver=4.1
-_rcrel=3
+_rcrel=4
 _rcnrel=armv7-x0
 
 pkgbase=linux-armv7-rc
@@ -29,15 +29,15 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
         'config')
 md5sums=('a86916bd12798220da9eb4a1eec3616d'
-         'a858fe84bfa6428ff24852221613131f'
-         '2667664157c7fde8f216362daa50a90f'
+         'e51c8a5fbd2b7839cdf8f8505a7999df'
+         '324544c3a477e0d86ff54fbbfbda2b80'
          'ae06c5772832d351d49b8ac0fe4a9ce2'
          '7057519a84b74c1a4ec4981396edd845'
          '1ce8c458126bfaf005366bc2e70ad866'
          '90911aad404f80fcf81488da57bf2906'
          '1a9033f9bd00f5397ba5ce5bdc842220'
          '648459624ebad128af1faa55a29d0e7d'
-         'c93defef5c780f75978a815af83aa863')
+         '5d0f89b10f43390bcdf513607e6b33bc')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config
index a07840c24..005530d9c 100644
--- a/core/linux-armv7-rc/config
+++ b/core/linux-armv7-rc/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.1.0-rc3-1 Kernel Configuration
+# Linux/arm 4.1.0-rc4-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1912,7 +1912,7 @@ CONFIG_TI_DAC7512=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
-CONFIG_CAPE_BEAGLEBONE=y
+CONFIG_BONE_CAPEMGR=y
 CONFIG_C2PORT=m
 
 #
@@ -1950,6 +1950,11 @@ CONFIG_ALTERA_STAPL=m
 #
 # Intel MIC Card Driver
 #
+
+#
+# Argus cape driver for beaglebone black
+#
+CONFIG_CAPE_BONE_ARGUS=y
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 CONFIG_HAVE_IDE=y
@@ -2247,7 +2252,6 @@ CONFIG_SUN4I_EMAC=m
 # CONFIG_NET_VENDOR_ALTEON is not set
 # CONFIG_ALTERA_TSE is not set
 # CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_XGENE is not set
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC_CORE=m
 CONFIG_ARC_EMAC=m
@@ -2364,7 +2368,6 @@ CONFIG_PHYLIB=y
 #
 CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
-# CONFIG_AMD_XGBE_PHY is not set
 CONFIG_MARVELL_PHY=y
 CONFIG_DAVICOM_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -3182,7 +3185,7 @@ CONFIG_PPS=y
 #
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
-# CONFIG_PPS_CLIENT_GPIO is not set
+CONFIG_PPS_CLIENT_GPIO=m
 
 #
 # PPS generators support
@@ -4396,7 +4399,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VGEM is not set
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS_FIMD=y
@@ -4902,7 +4905,7 @@ CONFIG_SND_SOC_WM8994=m
 CONFIG_SND_SOC_WM9712=m
 CONFIG_SND_SOC_MC13783=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
-# CONFIG_SND_SIMPLE_CARD is not set
+CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 
@@ -5499,7 +5502,7 @@ CONFIG_RTC_DRV_ISL12057=y
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF8523=y
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -5541,7 +5544,14 @@ CONFIG_RTC_DRV_CMOS=m
 CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+# CONFIG_RTC_DS1685_PROC_REGS is not set
+# CONFIG_RTC_DS1685_SYSFS_REGS is not set
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_DA9052=y