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 'master' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
omap-smp.c
diff --git
a/arch/arm/mach-omap2/omap-smp.c
b/arch/arm/mach-omap2/omap-smp.c
index
38153e5
..
1cf5231
100644
(file)
--- a/
arch/arm/mach-omap2/omap-smp.c
+++ b/
arch/arm/mach-omap2/omap-smp.c
@@
-24,7
+24,7
@@
#include <asm/localtimer.h>
#include <asm/smp_scu.h>
#include <mach/hardware.h>
-#include <
plat/
common.h>
+#include <
mach/omap4-
common.h>
/* SCU base address */
static void __iomem *scu_base;