From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 21 May 2013 03:46:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
X-Git-Tag: next-20130521~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e90ad34e544db61c4b8a6cace97107dbd7bd91e7;p=karo-tx-linux.git

Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
---

e90ad34e544db61c4b8a6cace97107dbd7bd91e7
diff --cc drivers/remoteproc/Kconfig
index d4d377c40ec9,2465c71ae705..ce1743d0b679
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@@ -12,10 -10,11 +12,11 @@@ config REMOTEPRO
  config OMAP_REMOTEPROC
  	tristate "OMAP remoteproc support"
  	depends on HAS_DMA
 -	depends on ARCH_OMAP4
 +	depends on ARCH_OMAP4 || SOC_OMAP5
  	depends on OMAP_IOMMU
- 	depends on OMAP_MBOX_FWK
  	select REMOTEPROC
+ 	select MAILBOX
+ 	select OMAP2PLUS_MBOX
  	select RPMSG
  	help
  	  Say y here to support OMAP's remote processors (dual M3