From dc936a1ac5206b41fe17b5f7d6f83ac020d71750 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 21 Apr 2013 22:10:03 +0000
Subject: [PATCH] core/linux-imx6 to 3.0.35-2

---
 core/linux-imx6/PKGBUILD |  4 ++--
 core/linux-imx6/config   | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/linux-imx6/PKGBUILD b/core/linux-imx6/PKGBUILD
index e5dbc9f22..7ec625688 100644
--- a/core/linux-imx6/PKGBUILD
+++ b/core/linux-imx6/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('linux-imx6' 'linux-headers-imx6')
 _kernelname=${pkgname#linux}
 _basekernel=3.0
 pkgver=${_basekernel}.35
-pkgrel=1
+pkgrel=2
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -20,7 +20,7 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git')
 options=('!strip')
 source=('config'
         'change-default-console-loglevel.patch')
-md5sums=('576d6a1c28cafc1a2ee62b2431e0e4b3'
+md5sums=('6017a7e39390a6bc11b8a8c2ef89a38b'
          '9d3c56a4b999c8bfbd4018089a62f662')
 
 __gitroot="git://github.com/boundarydevices/linux-imx6.git"
diff --git a/core/linux-imx6/config b/core/linux-imx6/config
index 65bd04099..73ab2355f 100644
--- a/core/linux-imx6/config
+++ b/core/linux-imx6/config
@@ -352,8 +352,9 @@ CONFIG_MACH_MX6Q_SABREAUTO=y
 # MX6 Options:
 #
 CONFIG_IMX_PCIE=y
-# CONFIG_USB_EHCI_ARC_H1 is not set
-# CONFIG_USB_FSL_ARC_OTG is not set
+# CONFIG_PCIE_FORCE_GEN1 is not set
+CONFIG_USB_EHCI_ARC_H1=y
+CONFIG_USB_FSL_ARC_OTG=y
 # CONFIG_MX6_INTER_LDO_BYPASS is not set
 # CONFIG_MX6_CLK_FOR_BOOTUI_TRANS is not set
 CONFIG_ISP1504_MXC=y
@@ -1781,6 +1782,7 @@ CONFIG_DEVKMEM=y
 # Serial drivers
 #
 # CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_XR17V35X is not set
 
 #
 # Non-8250 serial port support
@@ -1969,7 +1971,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_MXC=m
+# CONFIG_W1_MASTER_MXC is not set
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
 
@@ -3005,11 +3007,11 @@ CONFIG_USB_OTG=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ARC=y
 CONFIG_USB_EHCI_ARC_OTG=y
-# CONFIG_USB_EHCI_ARC_HSIC is not set
+CONFIG_USB_EHCI_ARC_HSIC=y
 # CONFIG_USB_STATIC_IRAM is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_MXC is not set
+CONFIG_USB_EHCI_MXC=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set