Merge branch 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux...

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: Create omapdrm inside display
  ARM: OMAP2+: Enable DSS and OMAPDRM

Conflicts:
	arch/arm/configs/omap2plus_defconfig

Signed-off-by: Dan Murphy <dmurphy@ti.com>

diff --cc arch/arm/configs/omap2plus_defconfig
index 629dcd2be20655c5af5841e8da6817e1415034cc,6ddb47dc7cea57bef7e41153cef725da2f1dff1c..ec272b2a7f865032f9d44ef5bdbba5ae1c27329a
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -150,8 -144,7 +150,8 @@@ CONFIG_MFD_TPS65910=
  CONFIG_REGULATOR_TPS65023=y
  CONFIG_REGULATOR_TPS6507X=y
  CONFIG_REGULATOR_TPS65217=y
- CONFIG_FB=y
 +CONFIG_REGULATOR_TPS65910=y
+ CONFIG_DRM=y
  CONFIG_FIRMWARE_EDID=y
  CONFIG_FB_MODE_HELPERS=y
  CONFIG_FB_TILEBLITTING=y
@@@ -230,8 -206,10 +231,11 @@@ CONFIG_RTC_DRV_TWL92330=
  CONFIG_RTC_DRV_TWL4030=y
  CONFIG_RTC_DRV_PALMAS=y
  CONFIG_DMADEVICES=y
 +CONFIG_TI_EDMA=y
  CONFIG_DMA_OMAP=y
+ CONFIG_STAGING=y
+ CONFIG_DRM_OMAP=y
+ CONFIG_DRM_OMAP_NUM_CRTCS=3
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set

diff --cc arch/arm/mach-omap2/Makefile
Simple merge