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
/
pxa2xx.c
diff --git
a/arch/arm/mach-pxa/pxa2xx.c
b/arch/arm/mach-pxa/pxa2xx.c
index
73d04d8
..
2f3394f
100644
(file)
--- a/
arch/arm/mach-pxa/pxa2xx.c
+++ b/
arch/arm/mach-pxa/pxa2xx.c
@@
-16,7
+16,6
@@
#include <mach/hardware.h>
#include <mach/pxa2xx-regs.h>
-#include <mach/mfp-pxa2xx.h>
#include <mach/mfp-pxa25x.h>
#include <mach/reset.h>
#include <mach/irda.h>