From b0dba0cd413270fb78cf6771d6a91662e285d861 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 3 Dec 2013 23:37:40 +0000
Subject: [PATCH] Minor ARM cleanups and remove obsolete options

---
 config-armv7         | 4 +---
 config-armv7-generic | 7 ++++---
 config-generic       | 3 ---
 kernel.spec          | 3 +++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/config-armv7 b/config-armv7
index 0ff886129..22eab1120 100644
--- a/config-armv7
+++ b/config-armv7
@@ -156,9 +156,6 @@ CONFIG_GPIO_PALMAS=y
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL18XX=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_MFD_WL1273_CORE=m
@@ -257,6 +254,7 @@ CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_OMAP_SOC_AM3517EVM=m
 CONFIG_SND_OMAP_SOC_DMIC=m
+CONFIG_SND_OMAP_SOC_HDMI=m
 CONFIG_SND_OMAP_SOC_IGEP0020=m
 CONFIG_SND_OMAP_SOC_MCBSP=m
 CONFIG_SND_OMAP_SOC_MCPDM=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 9a5ff096c..e5c7e8696 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -349,14 +349,15 @@ CONFIG_SND_SOC=m
 CONFIG_SND_SPI=y
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_JACK=y
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_JACK=y
-CONFIG_SND_COMPRESS_OFFLOAD=m
 # CONFIG_SND_ATMEL_SOC is not set
 
 # Displays
diff --git a/config-generic b/config-generic
index 002a2a017..e8d41b795 100644
--- a/config-generic
+++ b/config-generic
@@ -1744,12 +1744,9 @@ CONFIG_USB_NET_SMSC75XX=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-# CONFIG_WL12XX_HT is not set
 CONFIG_WL12XX_SPI=m
 CONFIG_WL12XX_SDIO=m
-# CONFIG_WL12XX_SDIO_TEST is not set
 
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
diff --git a/kernel.spec b/kernel.spec
index 9a76df0ce..bebd95d73 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2190,6 +2190,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Tue Dec  3 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM cleanups and remove obsolete options
+
 * Mon Dec 02 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git2.1
 - Linux v3.13-rc2-119-ga45299e