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 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
am200epd.c
diff --git
a/arch/arm/mach-pxa/am200epd.c
b/arch/arm/mach-pxa/am200epd.c
index
77ee80e
..
3499fad
100644
(file)
--- a/
arch/arm/mach-pxa/am200epd.c
+++ b/
arch/arm/mach-pxa/am200epd.c
@@
-30,8
+30,8
@@
#include <linux/irq.h>
#include <linux/gpio.h>
+#include <mach/pxa25x.h>
#include <mach/gumstix.h>
-#include <mach/mfp-pxa25x.h>
#include <mach/pxafb.h>
#include "generic.h"