From a50ba3cd020da6370786bf8fb8348d100e8a03f3 Mon Sep 17 00:00:00 2001
From: Dave Higham <iphone@dogagent.com>
Date: Sun, 26 Jan 2014 21:30:11 +0000
Subject: [PATCH] core/linux-imx6-cubox add bluetooth assortment and rfkill

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

diff --git a/core/linux-imx6-cubox/PKGBUILD b/core/linux-imx6-cubox/PKGBUILD
index 188733f8c..2ffaa83cc 100644
--- a/core/linux-imx6-cubox/PKGBUILD
+++ b/core/linux-imx6-cubox/PKGBUILD
@@ -15,7 +15,7 @@ _srcname=linux-imx6-${_commit}
 _kernelname=${pkgname#linux}
 _basekernel=3.0
 pkgver=${_basekernel}.35
-pkgrel=6
+pkgrel=7
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -27,7 +27,7 @@ source=("https://github.com/solidrun/linux-imx6/archive/${_commit}.tar.gz"
         'change-default-console-loglevel.pat'
         'memset.patch')
 md5sums=('ec483c15c977807a87a98de633b3e410'
-         '4a59ffd9524b8d7d0d4dc56c299658c0'
+         'c8a6136d264c1398b4908b3b09311b34'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '39be2896f0b968d61a19b33da75ce6e0')
 
diff --git a/core/linux-imx6-cubox/config b/core/linux-imx6-cubox/config
index 2e4ab8e94..e99a97b0a 100644
--- a/core/linux-imx6-cubox/config
+++ b/core/linux-imx6-cubox/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.35-6 Kernel Configuration
+# Linux/arm 3.0.35-7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -315,7 +315,7 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_PCIE=y
 # CONFIG_ARCH_MX503 is not set
 # CONFIG_ARCH_MX51 is not set
 CONFIG_ARCH_MX6=y
-# CONFIG_MACH_IMX_BLUETOOTH_RFKILL is not set
+CONFIG_MACH_IMX_BLUETOOTH_RFKILL=m
 CONFIG_ARCH_MX6Q=y
 CONFIG_FORCE_MAX_ZONEORDER=14
 CONFIG_SOC_IMX6Q=y
@@ -799,7 +799,7 @@ CONFIG_BT_HIDP=y
 # Bluetooth device drivers
 #
 CONFIG_BT_HCIBTUSB=y
-# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=y
 # CONFIG_BT_HCIUART_H4 is not set
 # CONFIG_BT_HCIUART_BCSP is not set
@@ -809,7 +809,8 @@ CONFIG_BT_HCIUART_ATH3K=y
 # CONFIG_BT_HCIBPA10X is not set
 # CONFIG_BT_HCIBFUSB is not set
 CONFIG_BT_HCIVHCI=y
-# CONFIG_BT_MRVL is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
 # CONFIG_BT_ATH3K is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y