From b7868457e781ea9c4b6460968570a60dc5680d1d Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Tue, 28 Feb 2012 13:04:33 +0200
Subject: [PATCH] --- yaml --- r: 295999 b: refs/heads/master c:
 9cd8eb433cbd440b25d4080b5add998da21fdb9c h: refs/heads/master i:   295997:
 981657bd4d43d51edb1b92d518b5f57335062805   295995:
 62369de79544adb3ca66fdc7d184cee7c0d40c11   295991:
 6bef0b87839f6bfc28be11ff05bf565456ddff89   295983:
 7a6e12ce56c4a901ff7057de4b8d7134ed2679da   295967:
 13fa3846aa1357c8196bcbaec8a608c839606028   295935:
 4fc58dc31a5080c3898d5c1aa98da32ecc86ba57 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/remoteproc/Kconfig | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 92d16c3d03f2..ebb2d8088817 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40b78b2cc75315a76ab1863be744d8580030f924
+refs/heads/master: 9cd8eb433cbd440b25d4080b5add998da21fdb9c
diff --git a/trunk/drivers/remoteproc/Kconfig b/trunk/drivers/remoteproc/Kconfig
index 25fc4ccbc2ea..24d880e78ec6 100644
--- a/trunk/drivers/remoteproc/Kconfig
+++ b/trunk/drivers/remoteproc/Kconfig
@@ -8,11 +8,10 @@ config REMOTEPROC
 config OMAP_REMOTEPROC
 	tristate "OMAP remoteproc support"
 	depends on ARCH_OMAP4
-	select OMAP_IOMMU
+	depends on OMAP_IOMMU
 	select REMOTEPROC
 	select OMAP_MBOX_FWK
 	select RPMSG
-	default m
 	help
 	  Say y here to support OMAP's remote processors (dual M3
 	  and DSP on OMAP4) via the remote processor framework.