projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-pxa
/
am200epd.c
diff --git
a/arch/arm/mach-pxa/am200epd.c
b/arch/arm/mach-pxa/am200epd.c
index 12fb0f4ae359a284bf6a886b897a533a4f784694..50e18ed37fa6e47172be9eff8725a9424c279da5 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
"pxa25x.h"
+#include
"gumstix.h"
#include <linux/platform_data/video-pxafb.h>
#include "generic.h"