summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-04-07 08:42:54 +0100
committerAndy Green <andy.green@linaro.org>2011-04-07 08:42:54 +0100
commitccf13a3445378e90f2ecdf3a5e6d05827200046f (patch)
tree30840a6e3779eec3d1a4b18917b99348e8249296 /arch/arm/configs
parentbab0896da86ff789b712039318d6b0e4a84c1f80 (diff)
config bt fm
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/omap4_defconfig17
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig
index 50ba084861d..2b276284971 100644
--- a/arch/arm/configs/omap4_defconfig
+++ b/arch/arm/configs/omap4_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38.2 Kernel Configuration
-# Tue Apr 5 13:55:27 2011
+# Tue Apr 5 14:43:22 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -640,6 +640,7 @@ CONFIG_BT_HCIBPA10X=m
# CONFIG_BT_HCIBFUSB is not set
# CONFIG_BT_HCIVHCI is not set
# CONFIG_BT_MRVL is not set
+CONFIG_BT_WILINK=y
# CONFIG_AF_RXRPC is not set
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
@@ -1718,6 +1719,11 @@ CONFIG_RADIO_ADAPTERS=y
# CONFIG_RADIO_SAA7706H is not set
# CONFIG_RADIO_TEF6862 is not set
CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=y
CONFIG_HAVE_TI_TILER=y
CONFIG_TI_TILER=y
CONFIG_TILER_GRANULARITY=128
@@ -1775,11 +1781,11 @@ CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
CONFIG_OMAP2_DSS_DPI=y
# CONFIG_OMAP2_DSS_RFBI is not set
# CONFIG_OMAP2_DSS_VENC is not set
-CONFIG_OMAP4_DSS_HDMI=y
+# CONFIG_OMAP4_DSS_HDMI is not set
# CONFIG_OMAP2_DSS_SDI is not set
CONFIG_OMAP2_DSS_DSI=y
# CONFIG_OMAP2_DSS_USE_DSI_PLL is not set
-# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
+CONFIG_OMAP2_DSS_FAKE_VSYNC=y
CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
CONFIG_FB_OMAP2=y
CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
@@ -2234,11 +2240,6 @@ CONFIG_STAGING=y
# CONFIG_IIO is not set
# CONFIG_ZRAM is not set
# CONFIG_FB_SM7XX is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_ST_BT=y
# CONFIG_LIRC_STAGING is not set
# CONFIG_SMB_FS is not set
# CONFIG_EASYCAP is not set