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
/
mx3_camera.c
diff --git
a/drivers/media/platform/soc_camera/mx3_camera.c
b/drivers/media/platform/soc_camera/mx3_camera.c
index
16975c6
..
3557ac9
100644
(file)
--- a/
drivers/media/platform/soc_camera/mx3_camera.c
+++ b/
drivers/media/platform/soc_camera/mx3_camera.c
@@
-25,8
+25,8
@@
#include <media/soc_mediabus.h>
#include <mach/ipu.h>
-#include <
mach/mx3_camera
.h>
-#include <
mach/dma
.h>
+#include <
linux/platform_data/camera-mx3
.h>
+#include <
linux/platform_data/dma-imx
.h>
#define MX3_CAM_DRV_NAME "mx3-camera"