From ee4a214c8e95e417c4ebe21ef194af0a73cb525a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 2 Apr 2014 08:51:30 -0500
Subject: [PATCH] merge to:
https://github.com/RobertCNelson/linux/commit/b33ce442993865180292df2a314ee5251ba38b50
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patches/defconfig | 10 ++++++----
version.sh | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/patches/defconfig b/patches/defconfig
index 87bd33b1d..1dbd505a2 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1423,7 +1423,7 @@ CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL_REGULATOR is not set
# CONFIG_RFKILL_GPIO is not set
CONFIG_NET_9P=m
-# CONFIG_NET_9P_VIRTIO is not set
+CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_DEBUG is not set
# CONFIG_CAIF is not set
CONFIG_CEPH_LIB=m
@@ -1813,7 +1813,7 @@ CONFIG_NETPOLL=y
CONFIG_NET_POLL_CONTROLLER=y
CONFIG_TUN=m
CONFIG_VETH=m
-# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRTIO_NET=m
CONFIG_NLMON=m
CONFIG_ATM_DRIVERS=y
CONFIG_ATM_DUMMY=m
@@ -3672,7 +3672,7 @@ CONFIG_SND_IMX_SOC=m
CONFIG_SND_SOC_IMX_SSI=m
CONFIG_SND_SOC_IMX_PCM_DMA=m
CONFIG_SND_SOC_IMX_AUDMUX=m
-# CONFIG_SND_SOC_EUKREA_TLV320 is not set
+CONFIG_SND_SOC_EUKREA_TLV320=m
CONFIG_SND_SOC_IMX_WM8962=m
CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_SND_SOC_IMX_SPDIF=m
@@ -3710,6 +3710,8 @@ CONFIG_SND_SOC_SGTL5000=m
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
# CONFIG_SND_SOC_SPDIF is not set
# CONFIG_SND_SOC_TAS5086 is not set
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TWL4030=m
CONFIG_SND_SOC_TWL6040=m
@@ -3729,7 +3731,7 @@ CONFIG_SND_SOC_TWL6040=m
# CONFIG_SND_SOC_WM8903 is not set
CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_MC13783=m
-# CONFIG_SND_SOC_TPA6130A2 is not set
+CONFIG_SND_SOC_TPA6130A2=m
# CONFIG_SND_SIMPLE_CARD is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
diff --git a/version.sh b/version.sh
index e846d25f1..102680a40 100644
--- a/version.sh
+++ b/version.sh
@@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8"
#Kernel/Build
KERNEL_REL=3.14
KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-devel-r3
+BUILD=armv7-devel-r4
#v3.X-rcX + upto SHA
-KERNEL_SHA="3e75c6de1ac33fe3500f44573d9212dc82c99f59"
+KERNEL_SHA="b33ce442993865180292df2a314ee5251ba38b50"
#git branch
#BRANCH="v3.15.x"
--
GitLab