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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ep93xx
/
core.c
diff --git
a/arch/arm/mach-ep93xx/core.c
b/arch/arm/mach-ep93xx/core.c
index
5fed576
..
f99f436
100644
(file)
--- a/
arch/arm/mach-ep93xx/core.c
+++ b/
arch/arm/mach-ep93xx/core.c
@@
-36,7
+36,7
@@
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/tlbflush.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/tlbflush.h>
@@
-46,7
+46,7
@@
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
-#include <
asm/ar
ch/gpio.h>
+#include <
ma
ch/gpio.h>
#include <asm/hardware/vic.h>
#include <asm/hardware/vic.h>