From 054be56ac1e959031d5280154548b232692ca3ba Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 2 Aug 2013 05:46:02 +0000
Subject: [PATCH] core/linux-sun7i to 3.3.0-2 (#532)

---
 core/linux-sun7i/PKGBUILD |  4 ++--
 core/linux-sun7i/config   | 44 +++++++++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/core/linux-sun7i/PKGBUILD b/core/linux-sun7i/PKGBUILD
index 6f5aeef2b..3329c5725 100644
--- a/core/linux-sun7i/PKGBUILD
+++ b/core/linux-sun7i/PKGBUILD
@@ -9,7 +9,7 @@ _srcname=linux-sunxi-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="sun7i"
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="https://github.com/cubieboard2/linux-sunxi"
 license=('GPL2')
@@ -18,7 +18,7 @@ options=('!strip')
 source=("https://github.com/cubieboard2/linux-sunxi/archive/${_commit}.tar.gz"
         'config')
 md5sums=('7fa48cc5b9d8917601aa1f95818a6a08'
-         '44b028b8201f532db66adb1a3975cb8b')
+         'b4434e1a8d196cb37a4934b84acd9c2f')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-sun7i/config b/core/linux-sun7i/config
index 958ec34c1..4f365497a 100644
--- a/core/linux-sun7i/config
+++ b/core/linux-sun7i/config
@@ -1146,7 +1146,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
+CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_IWMC3200TOP=m
 # CONFIG_IWMC3200TOP_DEBUG is not set
@@ -1288,7 +1288,7 @@ CONFIG_MII=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_VETH is not set
 
 #
@@ -1400,11 +1400,14 @@ CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_WLAN=y
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_AT76C50X_USB is not set
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AT76C50X_USB=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
-# CONFIG_RTL8187 is not set
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_ATH_COMMON=m
@@ -1426,20 +1429,39 @@ CONFIG_BCMDHD_OOB=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 # CONFIG_LIBERTAS_SDIO is not set
 # CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
-# CONFIG_P54_COMMON is not set
-# CONFIG_RT2X00 is not set
-# CONFIG_RTL8192CU is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX_MENU is not set
-# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_RTL8192CU_SW=m