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 'late/fixes' into fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x2xx.c
diff --git
a/arch/arm/mach-pxa/cm-x2xx.c
b/arch/arm/mach-pxa/cm-x2xx.c
index
ae5e74a
..
a103c8f
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x2xx.c
+++ b/
arch/arm/mach-pxa/cm-x2xx.c
@@
-25,7
+25,7
@@
#undef GPIO24_SSP1_SFRM
#include <mach/pxa27x.h>
#include <mach/audio.h>
-#include <
mach/
pxafb.h>
+#include <
linux/platform_data/video-
pxafb.h>
#include <mach/smemc.h>
#include <asm/hardware/it8152.h>