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 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
e350.c
diff --git
a/arch/arm/mach-pxa/e350.c
b/arch/arm/mach-pxa/e350.c
index
2511293
..
0800362
100644
(file)
--- a/
arch/arm/mach-pxa/e350.c
+++ b/
arch/arm/mach-pxa/e350.c
@@
-20,9
+20,8
@@
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
-#include <mach/mfp-pxa25x.h>
-#include <mach/pxa-regs.h>
-#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/pxa25x.h>
#include <mach/eseries-gpio.h>
#include <mach/udc.h>