[kernel/stabilization] Minor ARM cleanups and remove obsolete options

[Peter Robinson]

commit ac9144f555a4f7fb73e72d3bde88b7c944d7e54d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Dec 3 23:41:44 2013 +0000

    Minor ARM cleanups and remove obsolete options

 config-armv7         |    4 +---
 config-armv7-generic |   11 +++++++----
 config-generic       |    3 ---
 kernel.spec          |    3 +++
 4 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/config-armv7 b/config-armv7
index 910f749..5df800c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -162,9 +162,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
@@ -262,6 +259,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 29c90e0..7800af2 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -340,15 +340,18 @@ CONFIG_USB_DWC3_PCI=m
 CONFIG_DW_WATCHDOG=m
 
 # Sound
-CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=m
 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_CACHE_LZO=y
 CONFIG_SND_SOC_ALL_CODECS=m
-CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_SOC_CACHE_LZO=y
+CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_ATMEL_SOC is not set
 
diff --git a/config-generic b/config-generic
index 315f40b..c2f589b 100644
--- a/config-generic
+++ b/config-generic
@@ -1712,12 +1712,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 6c18fdb..54f233e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2319,6 +2319,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Tue Dec  3 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- Minor ARM cleanups and remove obsolete options
+
 * Tue Dec 03 2013 Josh Boyer <jwboyer at fedoraproject.org>
 - Add patches to fix rfkill switch on Dell machines (rhbz 958826)