git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/vga.support' into stable/drivers
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
ocotp.c
diff --git
a/arch/arm/mach-mxs/ocotp.c
b/arch/arm/mach-mxs/ocotp.c
index
65157a3
..
54add60
100644
(file)
--- a/
arch/arm/mach-mxs/ocotp.c
+++ b/
arch/arm/mach-mxs/ocotp.c
@@
-16,6
+16,8
@@
#include <linux/err.h>
#include <linux/mutex.h>
+#include <asm/processor.h> /* for cpu_relax() */
+
#include <mach/mxs.h>
#define OCOTP_WORD_OFFSET 0x20