git.samba.org
/
sfrench
/
cifs-2.6.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/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
edb93xx.c
diff --git
a/arch/arm/mach-ep93xx/edb93xx.c
b/arch/arm/mach-ep93xx/edb93xx.c
index 34e18e9556d9b928b3505594dd5583835743a0d8..c8c47122cf1de889941d002d00a6c242b9cf9914 100644
(file)
--- a/
arch/arm/mach-ep93xx/edb93xx.c
+++ b/
arch/arm/mach-ep93xx/edb93xx.c
@@
-33,10
+33,10
@@
#include <sound/cs4271.h>
#include <sound/cs4271.h>
-#include
<mach/hardware.h>
+#include
"hardware.h"
#include <linux/platform_data/video-ep93xx.h>
#include <linux/platform_data/spi-ep93xx.h>
#include <linux/platform_data/video-ep93xx.h>
#include <linux/platform_data/spi-ep93xx.h>
-#include
<mach/gpio-ep93xx.h>
+#include
"gpio-ep93xx.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>