commit 77664f29f52e153914812a1a82717e2e7f84bb98
author Linux Build Service Account <lnxbuild@localhost> Tue May 01 13:58:55 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue May 01 13:58:55 2012 -0700
tree efbf4849d4c4d242cf6a4e31b1616f52b8f203cc
parent a6e61da7bd49e3f507d685e4f4856c87a7e05115
parent 313c9f6a9a0831fd19ec490419be46a84707f8d8

Merge "msm: iommu: Enable IO-MMU support for 8660" into msm-3.0

arch/arm/configs/msm8660-perf_defconfig

diff --git a/arch/arm/configs/msm8660-perf_defconfig b/arch/arm/configs/msm8660-perf_defconfig
index a6bbaf4..87296cc 100644
--- a/arch/arm/configs/msm8660-perf_defconfig
+++ b/arch/arm/configs/msm8660-perf_defconfig
@@ -69,6 +69,7 @@
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_RPM_LOG=y
 CONFIG_MSM_RPM_STATS_LOG=y
+CONFIG_MSM_IOMMU=y
 CONFIG_MSM_WATCHDOG=y
 CONFIG_MSM_DLOAD_MODE=y
 CONFIG_MSM_ETM=y

arch/arm/configs/msm8660_defconfig

diff --git a/arch/arm/configs/msm8660_defconfig b/arch/arm/configs/msm8660_defconfig
index df49bdc..fd06714 100644
--- a/arch/arm/configs/msm8660_defconfig
+++ b/arch/arm/configs/msm8660_defconfig
@@ -68,6 +68,7 @@
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_RPM_LOG=y
 CONFIG_MSM_RPM_STATS_LOG=y
+CONFIG_MSM_IOMMU=y
 CONFIG_MSM_WATCHDOG=y
 CONFIG_MSM_DLOAD_MODE=y
 CONFIG_MSM_ETM=y