From dc64fbc5b665b0b18da1e6172196147aa64f5bd0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 23 Oct 2013 03:15:37 +0000
Subject: [PATCH] core/linux-am33x to 3.12.0-4

---
 core/linux-am33x/PKGBUILD | 12 ++++++------
 core/linux-am33x/config   |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD
index 3a7c53884..ad49c5e3e 100644
--- a/core/linux-am33x/PKGBUILD
+++ b/core/linux-am33x/PKGBUILD
@@ -4,22 +4,22 @@
 buildarch=4
 
 pkgbase=linux-am33x
-_srcname=linux-3.12-rc5
+_srcname=linux-3.12-rc6
 _kernelname=${pkgbase#linux}
 _desc="TI AM335x Beaglebone (Black)"
 pkgver=3.12.0
-pkgrel=3
+pkgrel=4
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v3.x/testing/${_srcname}.tar.xz"
-        "rcn.patch.gz::http://rcn-ee.net/deb/sid-armhf/v3.12.0-rc5-bone6/patch-3.12-rc5-bone6.diff.gz"
+        "rcn.patch.gz::http://rcn-ee.net/deb/sid-armhf/v3.12.0-rc6-bone7/patch-3.12-rc6-bone7.diff.gz"
         'config')
-md5sums=('5968c33b887797de596cc34cfdf2f8a9'
-         '0b3e5f661052627779eedd36f87159c4'
-         '92c08deebe16c63f68d41895270adf66')
+md5sums=('b5acb7731f44f22b67e0b3ce49720ad0'
+         '158907e0a21660b01966a10f47f2ec98'
+         '29a45a36b526d95c61691bdff5e10d01')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-am33x/config b/core/linux-am33x/config
index 157d5b5c2..c32e9500a 100644
--- a/core/linux-am33x/config
+++ b/core/linux-am33x/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.0-rc4 Kernel Configuration
+# Linux/arm 3.12.0-rc6 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1486,7 +1486,6 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_MTD=y
-CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
 # CONFIG_PARPORT is not set