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 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
devices.c
diff --git
a/arch/arm/mach-pxa/devices.c
b/arch/arm/mach-pxa/devices.c
index
a2fc859
..
08b4103
100644
(file)
--- a/
arch/arm/mach-pxa/devices.c
+++ b/
arch/arm/mach-pxa/devices.c
@@
-11,7
+11,7
@@
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
-#include <
mach
/pxa27x_keypad.h>
+#include <
plat
/pxa27x_keypad.h>
#include <mach/pxa2xx_spi.h>
#include <mach/camera.h>
#include <mach/audio.h>