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 'for-4.5' of git://git.osdn.jp/gitroot/uclinux-h8/linux
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
icontrol.c
diff --git
a/arch/arm/mach-pxa/icontrol.c
b/arch/arm/mach-pxa/icontrol.c
index
a1869f9
..
cbaf4f6
100644
(file)
--- a/
arch/arm/mach-pxa/icontrol.c
+++ b/
arch/arm/mach-pxa/icontrol.c
@@
-20,8
+20,8
@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include
<mach/pxa320.h>
-#include
<mach/mxm8x10.h>
+#include
"pxa320.h"
+#include
"mxm8x10.h"
#include <linux/spi/spi.h>
#include <linux/spi/pxa2xx_spi.h>