From: Olof Johansson <olof@lixom.net>
Date: Thu, 9 May 2013 21:12:04 +0000 (-0700)
Subject: Merge branch 'next/mailbox' into for-next
X-Git-Tag: next-20130521~15^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=136dcbf6044ccfcef76c328691e2ed145506f4b3;p=karo-tx-linux.git

Merge branch 'next/mailbox' into for-next

* next/mailbox:
  mailbox: fix invalid use of sizeof in mailbox_msg_send()
  mailbox: call request_irq after mbox queues are allocated
  mailbox: check for NULL nb in mailbox_put
  mailbox/omap: check iomem resource before dereferencing it
  mailbox: create dbx500 mailbox driver
  mailbox: add no_irq send message
  mailbox: add IRQF_NO_SUSPEND flag
  mailbox: add shared memory mailbox type
  mailbox: change protection mechanisms
  mailbox: create opened message type
  mailbox: rename omap_mbox in mailbox
  mailbox: split internal header from API header
  mailbox: OMAP: introduce mailbox framework
  ARM: OMAP2+: mbox: remove dependencies with soc.h
  mailbox: rename pl320-ipc specific mailbox.h
---

136dcbf6044ccfcef76c328691e2ed145506f4b3
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