From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jan 2016 20:13:58 +0000 (-0800)
Subject: Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7aca74e7c1bbd2beed50d7d77065f26457e35b03;hp=1d3671df72e0fe28d7cc686cb432e87c06f4accc;p=deliverable%2Flinux.git

Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox fixlet from Jussi Brar.

* 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: constify mbox_chan_ops structure
---

diff --git a/drivers/mailbox/mailbox-sti.c b/drivers/mailbox/mailbox-sti.c
index 4835817c5365..2394cfe892b6 100644
--- a/drivers/mailbox/mailbox-sti.c
+++ b/drivers/mailbox/mailbox-sti.c
@@ -384,7 +384,7 @@ static struct mbox_chan *sti_mbox_xlate(struct mbox_controller *mbox,
 	return chan;
 }
 
-static struct mbox_chan_ops sti_mbox_ops = {
+static const struct mbox_chan_ops sti_mbox_ops = {
 	.startup	= sti_mbox_startup_chan,
 	.shutdown	= sti_mbox_shutdown_chan,
 	.send_data	= sti_mbox_send_data,