[kernel] Minor ARM config updates, Enable sound compressed offload on ARM

[Peter Robinson]

commit 622a4556e46043c9ad397f9141dbdda4828b06b3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Nov 30 20:17:35 2013 +0000

    Minor ARM config updates, Enable sound compressed offload on ARM

 config-armv7         |    2 +-
 config-armv7-generic |    9 +++++----
 kernel.spec          |    4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/config-armv7 b/config-armv7
index 4fc3689..0ff8861 100644
--- a/config-armv7
+++ b/config-armv7
@@ -101,7 +101,6 @@ CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_OMAP_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
 
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
@@ -362,6 +361,7 @@ CONFIG_IMX_WEIM=y
 CONFIG_IMX2_WDT=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_RTC_DRV_SNVS=m
 # CONFIG_FB_MX3 is not set
 
 CONFIG_SND_IMX_SOC=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 930151a..9a5ff09 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -61,7 +61,6 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 # CONFIG_ARCH_SHMOBILE_MULTI is not set
 
 # highbank
-# 2013/04/19 - stability issues
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_SATA_HIGHBANK=m
@@ -346,16 +345,18 @@ CONFIG_PCIE_DW=y
 CONFIG_PCI_EXYNOS=y
 
 # 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_DESIGNWARE_I2S=m
 CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_DMAENGINE_PCM=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/kernel.spec b/kernel.spec
index a646be3..55c3851 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2194,6 +2194,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sat Nov 30 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- Minor ARM config updates
+- Enable sound compressed offload on ARM
+
 * Fri Nov 29 2013 Josh Boyer <jwboyer at fedoraproject.org> - 3.13.0-0.rc3.git0.1
 - Linux v3.13-rc2
 - Disable debugging options.