commit 1bf76b117b96667b906976c757ed2a5f6342246c
author Linux Build Service Account <lnxbuild@localhost> Wed May 15 03:51:34 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed May 15 03:51:33 2013 -0700
tree 9ce719badcf530451a76af201a33eedee1014ab2
parent 2d84268e0c7082216521d938a3a3501ed151c463
parent 4c9b5cb6a31caf130529063ae80e0aa40284ce31

Merge "defconfig: mpq8092: Enable ION support"

arch/arm/configs/mpq8092_defconfig

diff --git a/arch/arm/configs/mpq8092_defconfig b/arch/arm/configs/mpq8092_defconfig
index 713691d..c06161d 100644
--- a/arch/arm/configs/mpq8092_defconfig
+++ b/arch/arm/configs/mpq8092_defconfig
@@ -54,6 +54,7 @@
 CONFIG_MSM_RUN_QUEUE_STATS=y
 CONFIG_MSM_SPM_V2=y
 CONFIG_MSM_L2_SPM=y
+CONFIG_MSM_MULTIMEDIA_USE_ION=y
 CONFIG_MSM_OCMEM=y
 CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y
 CONFIG_MSM_OCMEM_DEBUG=y
@@ -268,6 +269,8 @@
 CONFIG_REGULATOR_QPNP=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
+CONFIG_ION=y
+CONFIG_ION_MSM=y
 CONFIG_MSM_KGSL=y
 CONFIG_FB=y
 CONFIG_FB_MSM=y
@@ -329,6 +332,7 @@
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_CLKDIV=y
 CONFIG_MSM_IOMMU=y
+CONFIG_IOMMU_PGTABLES_L2=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT3_FS=y