git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujits...
[sfrench/cifs-2.6.git]
/
drivers
/
cpufreq
/
highbank-cpufreq.c
diff --git
a/drivers/cpufreq/highbank-cpufreq.c
b/drivers/cpufreq/highbank-cpufreq.c
index ec399ad2f059379891a4d384e5b24dc3b9c3ab59..1608f7105c9f882c9e787b34a3aa270d9ace75e5 100644
(file)
--- 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