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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
eseries.c
diff --git
a/arch/arm/mach-pxa/eseries.c
b/arch/arm/mach-pxa/eseries.c
index
dfce7d5
..
c60dadf
100644
(file)
--- a/
arch/arm/mach-pxa/eseries.c
+++ b/
arch/arm/mach-pxa/eseries.c
@@
-20,8
+20,7
@@
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
-#include <mach/mfp-pxa25x.h>
-#include <mach/hardware.h>
+#include <mach/pxa25x.h>
#include <mach/eseries-gpio.h>
#include <mach/udc.h>
#include <mach/irda.h>
#include <mach/eseries-gpio.h>
#include <mach/udc.h>
#include <mach/irda.h>