projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap-all' into devel
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
memory.c
diff --git
a/arch/arm/mach-omap2/memory.c
b/arch/arm/mach-omap2/memory.c
index 48b01f4cebc598a3fdabc15f3b3b33fe09ed3b2e..882c7022429260a291b60221b2ee587098608a22 100644
(file)
--- a/
arch/arm/mach-omap2/memory.c
+++ b/
arch/arm/mach-omap2/memory.c
@@
-21,8
+21,7
@@
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/clk.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
#include <mach/common.h>
#include <mach/clock.h>