Merge branch 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux...
authorDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 17:44:16 +0000 (12:44 -0500)
committerDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 17:44:16 +0000 (12:44 -0500)
TI-Feature: omap5_audio_video_base
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y

* 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
  ARM: OMAP: Display: Fix compile issues
  ASoC: omap-abe-core: Call driver_deffered_probe_trigger only if built in
  ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module

Signed-off-by: Dan Murphy <dmurphy@ti.com>
1  2 
arch/arm/configs/omap2plus_defconfig

index 61611251f26d54dcca9e5b5c06eb62eb0355526e,42228ff0006f1cdff80aa8acb6d3e26e10103cca..a9f4af4324b370be7ff1f0f0439af8dc911f8c55
@@@ -144,8 -134,8 +144,9 @@@ CONFIG_POWER_SUPPLY=
  CONFIG_WATCHDOG=y
  CONFIG_OMAP_WATCHDOG=y
  CONFIG_TWL4030_WATCHDOG=y
 +CONFIG_PALMAS_WATCHDOG=y
  CONFIG_MFD_TPS65217=y
+ CONFIG_TWL6040_CORE=y
  CONFIG_REGULATOR_TWL4030=y
  CONFIG_MFD_PALMAS=y
  CONFIG_MFD_PALMAS_GPADC=y