From 3f7b3ae795ae20036db10c6b0da66b6b4545bd33 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Fri, 8 Aug 2014 05:42:06 -0400
Subject: Linux v3.16-7503-g33caee39925b

---
 config-armv7-generic | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'config-armv7-generic')

diff --git a/config-armv7-generic b/config-armv7-generic
index b78f80e93..58abbb67b 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -183,6 +183,7 @@ CONFIG_POWER_RESET_SUN6I=y
 CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_MFD_AXP20X=y
 CONFIG_REGULATOR_AXP20X=m
+CONFIG_IR_SUNXI=m
 
 # Exynos
 CONFIG_ARCH_EXYNOS3=y
@@ -445,6 +446,8 @@ CONFIG_I2C_MV64XXX=m
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
 # CONFIG_CRYPTO_AES_ARM_BS is not set
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA512_ARM_NEON=m
 
 # DMA
 CONFIG_TI_PRIV_EDMA=y
@@ -579,6 +582,13 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_STA350 is not set
 # CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_ODROIDX2 is not set
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_EDMA_SOC is not set
+# CONFIG_SND_SOC_ROCKCHIP is not set
 
 # Displays
 CONFIG_BACKLIGHT_TPS65217=m
@@ -637,6 +647,7 @@ CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_LTC3589=m
 CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_DA9211=m
 
 CONFIG_CHARGER_MANAGER=y
 CONFIG_CHARGER_BQ2415X=m
-- 
cgit