summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Boudet <x-boudet@ti.com>2012-06-07 07:56:44 +0200
committerXavier Boudet <x-boudet@ti.com>2012-06-14 07:54:57 +0200
commit88b965f436a5325883138cf60cb0bf84fdebd767 (patch)
tree7e8da68391f8664cd4a65ddfb43e0cf786510643
parentedc30879b4071249af44b0c76587f45206cea102 (diff)
UBUNTU: Update Config
Signed-off-by: Xavier Boudet <x-boudet@ti.com>
-rw-r--r--debian.ti-omap4/config/config.common.ubuntu12
1 files changed, 7 insertions, 5 deletions
diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 5e73155443b3..6ac88cdb929b 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -1938,6 +1938,7 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_PID=y
# CONFIG_MAC80211_TKIP_DEBUG is not set
# CONFIG_MAC80211_VERBOSE_DEBUG is not set
+# CONFIG_MAC80211_VERBOSE_MESH_SYNC_DEBUG is not set
# CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG is not set
# CONFIG_MAC80211_VERBOSE_MPATH_DEBUG is not set
# CONFIG_MAC80211_VERBOSE_MPL_DEBUG is not set
@@ -2561,7 +2562,6 @@ CONFIG_OMAP4_IPU_CMA_SIZE=0x6500000
CONFIG_OMAP5_IPU_CMA_SIZE=0xA100000
CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_32K_TIMER_HZ=128
-# CONFIG_OMAP_ALLOW_OSWR is not set
CONFIG_OMAP_DIE_GOVERNOR=y
CONFIG_OMAP_DM_TIMER=y
CONFIG_OMAP_DSP_CMA_SIZE=0x400000
@@ -2857,7 +2857,6 @@ CONFIG_RPMSG=m
CONFIG_RPMSG_OMX=m
CONFIG_RPMSG_RESMGR=m
CONFIG_RPMSG_RESMGR_FWK=m
-CONFIG_RPMSG_SERVER_SAMPLE=m
CONFIG_RPS=y
CONFIG_RT2500USB=m
CONFIG_RT2800USB=m
@@ -3224,6 +3223,7 @@ CONFIG_SND_MTPAV=m
CONFIG_SND_MTS64=m
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_ABE=y
+CONFIG_SND_OMAP_SOC_DMIC=y
CONFIG_SND_OMAP_SOC_MCBSP=y
CONFIG_SND_OMAP_SOC_MCPDM=y
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y
@@ -3269,6 +3269,7 @@ CONFIG_SND_SOC_CS42L73=m
CONFIG_SND_SOC_CX20442=m
CONFIG_SND_SOC_DA7210=m
CONFIG_SND_SOC_DFBMCS320=m
+CONFIG_SND_SOC_DMIC=y
CONFIG_SND_SOC_I2C_AND_SPI=y
CONFIG_SND_SOC_JZ4740_CODEC=m
CONFIG_SND_SOC_L3=m
@@ -4098,13 +4099,14 @@ CONFIG_WIRELESS_EXT_SYSFS=y
# CONFIG_WL1251 is not set
# CONFIG_WL127X_RFKILL is not set
CONFIG_WL12XX=m
-CONFIG_WL12XX_MENU=m
CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_WL12XX_SDIO=m
-# CONFIG_WL12XX_SPI is not set
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
CONFIG_WLAN=y
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WL_TI=y
# CONFIG_WM831X_BACKUP is not set
# CONFIG_WM831X_POWER is not set
# CONFIG_WM831X_WATCHDOG is not set