Merge tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[~andy/linux] / drivers / remoteproc / omap_remoteproc.c

diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index a1f7ac1f8cf6d765ab809a4979f6b51ca4ca30ff..32c289c2ba136a732e1cb508f06360fa5ae28c48 100644 (file)
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -29,7 +29,7 @@
 #include <linux/remoteproc.h>
 
 #include <plat/mailbox.h>
-#include <plat/remoteproc.h>
+#include <linux/platform_data/remoteproc-omap.h>
 
 #include "omap_remoteproc.h"
 #include "remoteproc_internal.h"
@@ -116,6 +116,9 @@ static int omap_rproc_start(struct rproc *rproc)
        struct omap_rproc_pdata *pdata = pdev->dev.platform_data;
        int ret;
 
+       if (pdata->set_bootaddr)
+               pdata->set_bootaddr(rproc->bootaddr);
+
        oproc->nb.notifier_call = omap_rproc_mbox_callback;
 
        /* every omap rproc is assigned a mailbox instance for messaging */