path: root/drivers/cpufreq/highbank-cpufreq.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 11:21:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 11:21:19 -0700
commit43d451f163c1b615c1bedef95258c49712679eeb (patch)
tree52ed78b04435ffbd663a902bbd5bdb69a65ad584 /drivers/cpufreq/highbank-cpufreq.c
parent21d2271fd0812ebe3716cab0b48356837485a74d (diff)
parent9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a (diff)
Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox framework from Jassi Brar: "A framework for Mailbox controllers and clients have been cooking for more than a year now. Everybody in the CC list had been copied on patchset revisions and most of them have made sounds of approval, though just one concrete Reviewed-by. The patchset has also been in linux-next for a couple of weeks now and no conflict has been reported. The framework has the backing of at least 5 platforms, though I can't say if/when they upstream their drivers (some businesses have 'changed')" (Further acked-by by Arnd Bergmann and Suman Anna in the pull request thread) * 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration: dt: mailbox: add generic bindings doc: add documentation for mailbox framework mailbox: Introduce framework for mailbox mailbox: rename pl320-ipc specific mailbox.h
Diffstat (limited to 'drivers/cpufreq/highbank-cpufreq.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/highbank-cpufreq.c b/drivers/cpufreq/highbank-cpufreq.c
index ec399ad2f059..1608f7105c9f 100644
--- a/drivers/cpufreq/highbank-cpufreq.c
+++ b/drivers/cpufreq/highbank-cpufreq.c
@@ -19,7 +19,7 @@
#include <linux/cpu.h>
#include <linux/err.h>
#include <linux/of.h>
-#include <linux/mailbox.h>
+#include <linux/pl320-ipc.h>
#include <linux/platform_device.h>
#define HB_CPUFREQ_CHANGE_NOTE 0x80000001