aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2013-07-22 19:03:16 -0500
committerPraneeth Bajjuri2013-07-22 19:03:16 -0500
commit6bef119412f5f2498552dc0904292a10ed73b2ce (patch)
tree47e7f8b30eaf7eefbfb0ea09dcb20402ccf4a92f
parentd197a1f789f33209eb27b955f100714e4bc723f2 (diff)
parent31a90501a5a945b10f74b44c5ab9ce3550af283a (diff)
downloadkernel-video-6bef119412f5f2498552dc0904292a10ed73b2ce.tar.gz
kernel-video-6bef119412f5f2498552dc0904292a10ed73b2ce.tar.xz
kernel-video-6bef119412f5f2498552dc0904292a10ed73b2ce.zip
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
* p-ti-linux-3.8.y: ARM: OMAP: omap2plus_defconfig: disable USB debug flags ARM: omap2plus_defconfig: Enable dra7-evm sound support Change-Id: I45384b836e98f8b8a5ef44fd215ee664e84303bf Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--arch/arm/configs/omap2plus_defconfig23
1 files changed, 15 insertions, 8 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index e3514f7e7c0..3ef11817cf1 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -220,26 +220,34 @@ CONFIG_FONTS=y
220CONFIG_FONT_8x8=y 220CONFIG_FONT_8x8=y
221CONFIG_FONT_8x16=y 221CONFIG_FONT_8x16=y
222CONFIG_LOGO=y 222CONFIG_LOGO=y
223CONFIG_SOUND=m 223CONFIG_SOUND=y
224CONFIG_SND=m 224CONFIG_SND=y
225CONFIG_SND_TIMER=y
226CONFIG_SND_PCM=y
225CONFIG_SND_MIXER_OSS=m 227CONFIG_SND_MIXER_OSS=m
226CONFIG_SND_PCM_OSS=m 228CONFIG_SND_PCM_OSS=m
227CONFIG_SND_VERBOSE_PRINTK=y 229CONFIG_SND_VERBOSE_PRINTK=y
230CONFIG_SND_COMPRESS_OFFLOAD=y
228CONFIG_SND_DEBUG=y 231CONFIG_SND_DEBUG=y
229CONFIG_SND_USB_AUDIO=m 232CONFIG_SND_USB_AUDIO=m
230CONFIG_SND_SOC=m 233CONFIG_SND_SOC=y
231CONFIG_SND_OMAP_SOC=m 234CONFIG_SND_DAVINCI_SOC_MCASP=y
235CONFIG_SND_OMAP_SOC=y
236CONFIG_SND_OMAP_SOC_HDMI=y
232CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m 237CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
233CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m 238CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
239CONFIG_SND_OMAP_SOC_OMAP_HDMI=y
234CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m 240CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
241CONFIG_SND_DRA7_SOC_ATL=y
242CONFIG_SND_SOC_DRA7_EVM=y
243CONFIG_SND_SOC_I2C_AND_SPI=y
244CONFIG_SND_SOC_OMAP_HDMI_CODEC=y
245CONFIG_SND_SOC_TLV320AIC3X=y
235CONFIG_USB=y 246CONFIG_USB=y
236CONFIG_USB_DEBUG=y
237CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 247CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
238CONFIG_USB_SUSPEND=y 248CONFIG_USB_SUSPEND=y
239CONFIG_USB_EHCI_HCD=y 249CONFIG_USB_EHCI_HCD=y
240CONFIG_USB_DWC3=m 250CONFIG_USB_DWC3=m
241CONFIG_USB_DWC3_DEBUG=y
242CONFIG_USB_DWC3_VERBOSE=y
243CONFIG_USB_MUSB_HDRC=m 251CONFIG_USB_MUSB_HDRC=m
244CONFIG_USB_MUSB_OMAP2PLUS=m 252CONFIG_USB_MUSB_OMAP2PLUS=m
245CONFIG_USB_MUSB_AM35X=m 253CONFIG_USB_MUSB_AM35X=m
@@ -250,7 +258,6 @@ CONFIG_USB_WDM=y
250CONFIG_USB_STORAGE=y 258CONFIG_USB_STORAGE=y
251CONFIG_USB_TEST=y 259CONFIG_USB_TEST=y
252CONFIG_USB_GADGET=y 260CONFIG_USB_GADGET=y
253CONFIG_USB_GADGET_DEBUG=y
254CONFIG_USB_GADGET_DEBUG_FILES=y 261CONFIG_USB_GADGET_DEBUG_FILES=y
255CONFIG_USB_GADGET_DEBUG_FS=y 262CONFIG_USB_GADGET_DEBUG_FS=y
256CONFIG_USB_ZERO=m 263CONFIG_USB_ZERO=m