projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
palmz72.c
diff --git
a/arch/arm/mach-pxa/palmz72.c
b/arch/arm/mach-pxa/palmz72.c
index
1a35ddf
..
e3df17a
100644
(file)
--- a/
arch/arm/mach-pxa/palmz72.c
+++ b/
arch/arm/mach-pxa/palmz72.c
@@
-49,7
+49,7
@@
#include <mach/palm27x.h>
#include <mach/pm.h>
-#include <linux/platform_data/camera-pxa.h>
+#include <linux/platform_data/
media/
camera-pxa.h>
#include <media/soc_camera.h>