Merge branch 'samsung_platform_data' into staging/for_v3.7

[karo-tx-linux.git] / drivers / media / platform / soc_camera / mx1_camera.c

diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/platform/soc_camera/mx1_camera.c
similarity index 100%
rename from drivers/media/video/mx1_camera.c
rename to drivers/media/platform/soc_camera/mx1_camera.c