projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
himalaya.c
diff --git
a/arch/arm/mach-pxa/himalaya.c
b/arch/arm/mach-pxa/himalaya.c
index
7a8d749
..
70e9c06
100644
(file)
--- a/
arch/arm/mach-pxa/himalaya.c
+++ b/
arch/arm/mach-pxa/himalaya.c
@@
-24,7
+24,7
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include
<mach/pxa25x.h>
+#include
"pxa25x.h"
#include "generic.h"
#include "generic.h"