summaryrefslogtreecommitdiff
path: root/drivers/mailbox/mailbox-altera.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-25 18:38:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-25 18:38:40 -0700
commit9390bd0d14b4585f7ac2df15ff5f52af182251e1 (patch)
tree7e61faeb498ee8faf05ea0d413c490ff3cce3547 /drivers/mailbox/mailbox-altera.c
parentda996f7310eb7fa8d49223936111d3e86b72e2f3 (diff)
parent7d641938aa2ae433a97cc65ec622547cfe08f2ed (diff)
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar. * 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration: mailbox/bcm2835: Fix mailbox full detection. dt: mailbox: Remove 'mbox-names property is discouraged' message from binding mailbox: Add ability for clients to request channels by name mailbox: Enable BCM2835 mailbox support dt/bindings: Add binding for the BCM2835 mailbox driver mailbox: Fix up error handling in mbox_request_channel() mailbox: Make mbox_chan_ops const mailbox: altera: Add dependency on HAS_IOMEM
Diffstat (limited to 'drivers/mailbox/mailbox-altera.c')
-rw-r--r--drivers/mailbox/mailbox-altera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/mailbox-altera.c b/drivers/mailbox/mailbox-altera.c
index a266265677d3..bb682c926b0a 100644
--- a/drivers/mailbox/mailbox-altera.c
+++ b/drivers/mailbox/mailbox-altera.c
@@ -285,7 +285,7 @@ static void altera_mbox_shutdown(struct mbox_chan *chan)
}
}
-static struct mbox_chan_ops altera_mbox_ops = {
+static const struct mbox_chan_ops altera_mbox_ops = {
.send_data = altera_mbox_send_data,
.startup = altera_mbox_startup,
.shutdown = altera_mbox_shutdown,