aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-05-18 19:55:49 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-05-18 23:21:50 +0200
commit366b928eb8c36a1abbbc89bcb96c99d3059f9402 (patch)
tree2c5fa2c719f5391680e316a61f3e8821acb579b1
parent6def4103ce10bf611247eb648bcdfe4f0db19cc5 (diff)
downloadkernel_goldelico_gta04-replicant-4.0+jack-working.zip
kernel_goldelico_gta04-replicant-4.0+jack-working.tar.gz
kernel_goldelico_gta04-replicant-4.0+jack-working.tar.bz2
GTA04 Config: sync and add Jack.replicant-4.0+jack-working
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--arch/arm/configs/gta04_defconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/configs/gta04_defconfig b/arch/arm/configs/gta04_defconfig
index 563c76a..476b72f 100644
--- a/arch/arm/configs/gta04_defconfig
+++ b/arch/arm/configs/gta04_defconfig
@@ -299,8 +299,7 @@ CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_32K_TIMER_HZ=128
CONFIG_OMAP_DM_TIMER=y
# CONFIG_OMAP_PM_NONE is not set
-# CONFIG_OMAP_PM_NOOP is not set
-CONFIG_OMAP_PM=y
+CONFIG_OMAP_PM_NOOP=y
#
# TI OMAP2/3/4 Specific Features
@@ -525,7 +524,6 @@ CONFIG_CAN_PM_TRACE=y
CONFIG_ARCH_HAS_OPP=y
CONFIG_PM_OPP=y
CONFIG_PM_RUNTIME_CLK=y
-CONFIG_CPU_PM=y
# CONFIG_SUSPEND_TIME is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -990,6 +988,7 @@ CONFIG_MISC_DEVICES=y
# CONFIG_INTEL_MID_PTI is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_ANDROID_JACK=y
# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
# CONFIG_ISL29020 is not set
@@ -2046,15 +2045,16 @@ CONFIG_SND_USB=y
# CONFIG_SND_USB_CAIAQ is not set
# CONFIG_SND_USB_6FIRE is not set
CONFIG_SND_SOC=y
-CONFIG_SND_SOC_TWL4030=y
-CONFIG_SND_SOC_GTM601=y
-CONFIG_SND_SOC_SI47XX=y
-CONFIG_SND_SOC_W2CBW003=y
# CONFIG_SND_SOC_CACHE_LZO is not set
CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
CONFIG_SND_OMAP_SOC_GTA04=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_TWL4030=y
+CONFIG_SND_SOC_GTM601=y
+CONFIG_SND_SOC_SI47XX=y
+CONFIG_SND_SOC_W2CBW003=y
# CONFIG_SOUND_PRIME is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y