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 'samsung_platform_data' into staging/for_v3.7
[pandora-kernel.git]
/
drivers
/
media
/
platform
/
soc_camera
/
mx1_camera.c
diff --git
a/drivers/media/platform/soc_camera/mx1_camera.c
b/drivers/media/platform/soc_camera/mx1_camera.c
index
560a65a
..
bbe7099
100644
(file)
--- a/
drivers/media/platform/soc_camera/mx1_camera.c
+++ b/
drivers/media/platform/soc_camera/mx1_camera.c
@@
-44,7
+44,7
@@
#include <mach/dma-mx1-mx2.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
-#include <
mach/mx1_camera
.h>
+#include <
linux/platform_data/camera-mx1
.h>
/*
* CSI registers