---

yaml --- r: 330861 b: refs/heads/master c: 2c3fb08 h: refs/heads/master i: 330859: 8629110 v: v3
git-mirror · Aug 15, 2012 · d1ee73c · d1ee73c
1 parent 6caf14a
commit d1ee73c
Show file tree

Hide file tree

Showing 169 changed files with 38 additions and 38 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a2d1cf46500ab7599d0b45ee837f3936763ccac
+refs/heads/master: 2c3fb08b3f74b8792004095a1f6881a3296ff643
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
@@ -156,7 +156,7 @@ source "drivers/media/i2c/Kconfig"
 #
 # V4L platform/mem2mem drivers
 #
-source "drivers/media/video/Kconfig"
+source "drivers/media/platform/Kconfig"
 
 source "drivers/media/radio/Kconfig"
 

diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
   obj-$(CONFIG_MEDIA_SUPPORT) += media.o
 endif
 
-obj-y += tuners/ common/ rc/ video/
+obj-y += tuners/ common/ rc/ platform/
 obj-y += i2c/ pci/ usb/ mmc/ firewire/ parport/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/ v4l2-core/

diff --git a/trunk/drivers/media/video/Kconfig → trunk/drivers/media/platform/Kconfig b/trunk/drivers/media/video/Kconfig → trunk/drivers/media/platform/Kconfig
@@ -27,7 +27,7 @@ menuconfig V4L_PLATFORM_DRIVERS
 
 if V4L_PLATFORM_DRIVERS
 
-source "drivers/media/video/marvell-ccic/Kconfig"
+source "drivers/media/platform/marvell-ccic/Kconfig"
 
 config VIDEO_VIA_CAMERA
 	tristate "VIAFB camera controller support"
@@ -43,11 +43,11 @@ config VIDEO_VIA_CAMERA
 # Platform multimedia device configuration
 #
 
-source "drivers/media/video/davinci/Kconfig"
+source "drivers/media/platform/davinci/Kconfig"
 
-source "drivers/media/video/omap/Kconfig"
+source "drivers/media/platform/omap/Kconfig"
 
-source "drivers/media/video/blackfin/Kconfig"
+source "drivers/media/platform/blackfin/Kconfig"
 
 config VIDEO_SH_VOU
 	tristate "SuperH VOU video output driver"
@@ -212,8 +212,8 @@ config VIDEO_ATMEL_ISI
 	  This module makes the ATMEL Image Sensor Interface available
 	  as a v4l2 device.
 
-source "drivers/media/video/s5p-fimc/Kconfig"
-source "drivers/media/video/s5p-tv/Kconfig"
+source "drivers/media/platform/s5p-fimc/Kconfig"
+source "drivers/media/platform/s5p-tv/Kconfig"
 
 endif # V4L_PLATFORM_DRIVERS
 

diff --git a/trunk/drivers/media/video/Makefile → trunk/drivers/media/platform/Makefile b/trunk/drivers/media/video/Makefile → trunk/drivers/media/platform/Makefile
diff --git a/trunk/drivers/media/video/arv.c → trunk/drivers/media/platform/arv.c b/trunk/drivers/media/video/arv.c → trunk/drivers/media/platform/arv.c
diff --git a/trunk/drivers/media/video/atmel-isi.c → trunk/drivers/media/platform/atmel-isi.c b/trunk/drivers/media/video/atmel-isi.c → trunk/drivers/media/platform/atmel-isi.c
diff --git a/trunk/drivers/media/video/blackfin/Kconfig → ...k/drivers/media/platform/blackfin/Kconfig b/trunk/drivers/media/video/blackfin/Kconfig → ...k/drivers/media/platform/blackfin/Kconfig
diff --git a/trunk/drivers/media/video/blackfin/Makefile → .../drivers/media/platform/blackfin/Makefile b/trunk/drivers/media/video/blackfin/Makefile → .../drivers/media/platform/blackfin/Makefile
diff --git a/...ivers/media/video/blackfin/bfin_capture.c → ...rs/media/platform/blackfin/bfin_capture.c b/...ivers/media/video/blackfin/bfin_capture.c → ...rs/media/platform/blackfin/bfin_capture.c
diff --git a/trunk/drivers/media/video/blackfin/ppi.c → trunk/drivers/media/platform/blackfin/ppi.c b/trunk/drivers/media/video/blackfin/ppi.c → trunk/drivers/media/platform/blackfin/ppi.c
diff --git a/trunk/drivers/media/video/coda.c → trunk/drivers/media/platform/coda.c b/trunk/drivers/media/video/coda.c → trunk/drivers/media/platform/coda.c
diff --git a/trunk/drivers/media/video/coda.h → trunk/drivers/media/platform/coda.h b/trunk/drivers/media/video/coda.h → trunk/drivers/media/platform/coda.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/coda/coda_regs.h
+ * linux/drivers/media/platform/coda/coda_regs.h
  *
  * Copyright (C) 2012 Vista Silicon SL
  *    Javier Martin <javier.martin@vista-silicon.com>

diff --git a/trunk/drivers/media/video/davinci/Kconfig → trunk/drivers/media/platform/davinci/Kconfig b/trunk/drivers/media/video/davinci/Kconfig → trunk/drivers/media/platform/davinci/Kconfig
diff --git a/trunk/drivers/media/video/davinci/Makefile → ...k/drivers/media/platform/davinci/Makefile b/trunk/drivers/media/video/davinci/Makefile → ...k/drivers/media/platform/davinci/Makefile
diff --git a/...vers/media/video/davinci/ccdc_hw_device.h → ...s/media/platform/davinci/ccdc_hw_device.h b/...vers/media/video/davinci/ccdc_hw_device.h → ...s/media/platform/davinci/ccdc_hw_device.h
diff --git a/.../drivers/media/video/davinci/dm355_ccdc.c → ...ivers/media/platform/davinci/dm355_ccdc.c b/.../drivers/media/video/davinci/dm355_ccdc.c → ...ivers/media/platform/davinci/dm355_ccdc.c
diff --git a/...ers/media/video/davinci/dm355_ccdc_regs.h → .../media/platform/davinci/dm355_ccdc_regs.h b/...ers/media/video/davinci/dm355_ccdc_regs.h → .../media/platform/davinci/dm355_ccdc_regs.h
diff --git a/...drivers/media/video/davinci/dm644x_ccdc.c → ...vers/media/platform/davinci/dm644x_ccdc.c b/...drivers/media/video/davinci/dm644x_ccdc.c → ...vers/media/platform/davinci/dm644x_ccdc.c
diff --git a/...rs/media/video/davinci/dm644x_ccdc_regs.h → ...media/platform/davinci/dm644x_ccdc_regs.h b/...rs/media/video/davinci/dm644x_ccdc_regs.h → ...media/platform/davinci/dm644x_ccdc_regs.h
diff --git a/trunk/drivers/media/video/davinci/isif.c → trunk/drivers/media/platform/davinci/isif.c b/trunk/drivers/media/video/davinci/isif.c → trunk/drivers/media/platform/davinci/isif.c
diff --git a/...k/drivers/media/video/davinci/isif_regs.h → ...rivers/media/platform/davinci/isif_regs.h b/...k/drivers/media/video/davinci/isif_regs.h → ...rivers/media/platform/davinci/isif_regs.h
diff --git a/trunk/drivers/media/video/davinci/vpbe.c → trunk/drivers/media/platform/davinci/vpbe.c b/trunk/drivers/media/video/davinci/vpbe.c → trunk/drivers/media/platform/davinci/vpbe.c
diff --git a/...rivers/media/video/davinci/vpbe_display.c → ...ers/media/platform/davinci/vpbe_display.c b/...rivers/media/video/davinci/vpbe_display.c → ...ers/media/platform/davinci/vpbe_display.c
diff --git a/trunk/drivers/media/video/davinci/vpbe_osd.c → ...drivers/media/platform/davinci/vpbe_osd.c b/trunk/drivers/media/video/davinci/vpbe_osd.c → ...drivers/media/platform/davinci/vpbe_osd.c
diff --git a/...ivers/media/video/davinci/vpbe_osd_regs.h → ...rs/media/platform/davinci/vpbe_osd_regs.h b/...ivers/media/video/davinci/vpbe_osd_regs.h → ...rs/media/platform/davinci/vpbe_osd_regs.h
diff --git a/...k/drivers/media/video/davinci/vpbe_venc.c → ...rivers/media/platform/davinci/vpbe_venc.c b/...k/drivers/media/video/davinci/vpbe_venc.c → ...rivers/media/platform/davinci/vpbe_venc.c
diff --git a/...vers/media/video/davinci/vpbe_venc_regs.h → ...s/media/platform/davinci/vpbe_venc_regs.h b/...vers/media/video/davinci/vpbe_venc_regs.h → ...s/media/platform/davinci/vpbe_venc_regs.h
diff --git a/...rivers/media/video/davinci/vpfe_capture.c → ...ers/media/platform/davinci/vpfe_capture.c b/...rivers/media/video/davinci/vpfe_capture.c → ...ers/media/platform/davinci/vpfe_capture.c
diff --git a/trunk/drivers/media/video/davinci/vpif.c → trunk/drivers/media/platform/davinci/vpif.c b/trunk/drivers/media/video/davinci/vpif.c → trunk/drivers/media/platform/davinci/vpif.c
diff --git a/trunk/drivers/media/video/davinci/vpif.h → trunk/drivers/media/platform/davinci/vpif.h b/trunk/drivers/media/video/davinci/vpif.h → trunk/drivers/media/platform/davinci/vpif.h
diff --git a/...rivers/media/video/davinci/vpif_capture.c → ...ers/media/platform/davinci/vpif_capture.c b/...rivers/media/video/davinci/vpif_capture.c → ...ers/media/platform/davinci/vpif_capture.c
diff --git a/...rivers/media/video/davinci/vpif_capture.h → ...ers/media/platform/davinci/vpif_capture.h b/...rivers/media/video/davinci/vpif_capture.h → ...ers/media/platform/davinci/vpif_capture.h
diff --git a/...rivers/media/video/davinci/vpif_display.c → ...ers/media/platform/davinci/vpif_display.c b/...rivers/media/video/davinci/vpif_display.c → ...ers/media/platform/davinci/vpif_display.c
diff --git a/...rivers/media/video/davinci/vpif_display.h → ...ers/media/platform/davinci/vpif_display.h b/...rivers/media/video/davinci/vpif_display.h → ...ers/media/platform/davinci/vpif_display.h
diff --git a/trunk/drivers/media/video/davinci/vpss.c → trunk/drivers/media/platform/davinci/vpss.c b/trunk/drivers/media/video/davinci/vpss.c → trunk/drivers/media/platform/davinci/vpss.c
diff --git a/trunk/drivers/media/video/fsl-viu.c → trunk/drivers/media/platform/fsl-viu.c b/trunk/drivers/media/video/fsl-viu.c → trunk/drivers/media/platform/fsl-viu.c
diff --git a/trunk/drivers/media/video/indycam.c → trunk/drivers/media/platform/indycam.c b/trunk/drivers/media/video/indycam.c → trunk/drivers/media/platform/indycam.c
diff --git a/trunk/drivers/media/video/indycam.h → trunk/drivers/media/platform/indycam.h b/trunk/drivers/media/video/indycam.h → trunk/drivers/media/platform/indycam.h
diff --git a/trunk/drivers/media/video/m2m-deinterlace.c → .../drivers/media/platform/m2m-deinterlace.c b/trunk/drivers/media/video/m2m-deinterlace.c → .../drivers/media/platform/m2m-deinterlace.c
diff --git a/.../drivers/media/video/marvell-ccic/Kconfig → ...ivers/media/platform/marvell-ccic/Kconfig b/.../drivers/media/video/marvell-ccic/Kconfig → ...ivers/media/platform/marvell-ccic/Kconfig
diff --git a/...drivers/media/video/marvell-ccic/Makefile → ...vers/media/platform/marvell-ccic/Makefile b/...drivers/media/video/marvell-ccic/Makefile → ...vers/media/platform/marvell-ccic/Makefile
diff --git a/...rs/media/video/marvell-ccic/cafe-driver.c → ...media/platform/marvell-ccic/cafe-driver.c b/...rs/media/video/marvell-ccic/cafe-driver.c → ...media/platform/marvell-ccic/cafe-driver.c
diff --git a/...vers/media/video/marvell-ccic/mcam-core.c → ...s/media/platform/marvell-ccic/mcam-core.c b/...vers/media/video/marvell-ccic/mcam-core.c → ...s/media/platform/marvell-ccic/mcam-core.c
diff --git a/...vers/media/video/marvell-ccic/mcam-core.h → ...s/media/platform/marvell-ccic/mcam-core.h b/...vers/media/video/marvell-ccic/mcam-core.h → ...s/media/platform/marvell-ccic/mcam-core.h
diff --git a/...ers/media/video/marvell-ccic/mmp-driver.c → .../media/platform/marvell-ccic/mmp-driver.c b/...ers/media/video/marvell-ccic/mmp-driver.c → .../media/platform/marvell-ccic/mmp-driver.c
diff --git a/trunk/drivers/media/video/mem2mem_testdev.c → .../drivers/media/platform/mem2mem_testdev.c b/trunk/drivers/media/video/mem2mem_testdev.c → .../drivers/media/platform/mem2mem_testdev.c
diff --git a/trunk/drivers/media/video/mx1_camera.c → trunk/drivers/media/platform/mx1_camera.c b/trunk/drivers/media/video/mx1_camera.c → trunk/drivers/media/platform/mx1_camera.c
diff --git a/trunk/drivers/media/video/mx2_camera.c → trunk/drivers/media/platform/mx2_camera.c b/trunk/drivers/media/video/mx2_camera.c → trunk/drivers/media/platform/mx2_camera.c
diff --git a/trunk/drivers/media/video/mx2_emmaprp.c → trunk/drivers/media/platform/mx2_emmaprp.c b/trunk/drivers/media/video/mx2_emmaprp.c → trunk/drivers/media/platform/mx2_emmaprp.c
diff --git a/trunk/drivers/media/video/mx3_camera.c → trunk/drivers/media/platform/mx3_camera.c b/trunk/drivers/media/video/mx3_camera.c → trunk/drivers/media/platform/mx3_camera.c
diff --git a/trunk/drivers/media/video/omap/Kconfig → trunk/drivers/media/platform/omap/Kconfig b/trunk/drivers/media/video/omap/Kconfig → trunk/drivers/media/platform/omap/Kconfig
diff --git a/trunk/drivers/media/video/omap/Makefile → trunk/drivers/media/platform/omap/Makefile b/trunk/drivers/media/video/omap/Makefile → trunk/drivers/media/platform/omap/Makefile
diff --git a/trunk/drivers/media/video/omap/omap_vout.c → ...k/drivers/media/platform/omap/omap_vout.c b/trunk/drivers/media/video/omap/omap_vout.c → ...k/drivers/media/platform/omap/omap_vout.c
diff --git a/...drivers/media/video/omap/omap_vout_vrfb.c → ...vers/media/platform/omap/omap_vout_vrfb.c b/...drivers/media/video/omap/omap_vout_vrfb.c → ...vers/media/platform/omap/omap_vout_vrfb.c
diff --git a/...drivers/media/video/omap/omap_vout_vrfb.h → ...vers/media/platform/omap/omap_vout_vrfb.h b/...drivers/media/video/omap/omap_vout_vrfb.h → ...vers/media/platform/omap/omap_vout_vrfb.h
diff --git a/...k/drivers/media/video/omap/omap_voutdef.h → ...rivers/media/platform/omap/omap_voutdef.h b/...k/drivers/media/video/omap/omap_voutdef.h → ...rivers/media/platform/omap/omap_voutdef.h
diff --git a/...k/drivers/media/video/omap/omap_voutlib.c → ...rivers/media/platform/omap/omap_voutlib.c b/...k/drivers/media/video/omap/omap_voutlib.c → ...rivers/media/platform/omap/omap_voutlib.c
diff --git a/...k/drivers/media/video/omap/omap_voutlib.h → ...rivers/media/platform/omap/omap_voutlib.h b/...k/drivers/media/video/omap/omap_voutlib.h → ...rivers/media/platform/omap/omap_voutlib.h
diff --git a/trunk/drivers/media/video/omap1_camera.c → trunk/drivers/media/platform/omap1_camera.c b/trunk/drivers/media/video/omap1_camera.c → trunk/drivers/media/platform/omap1_camera.c
@@ -12,7 +12,7 @@
  * Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
  *
  * Hardware specific bits initialy based on former work by Matt Callow
- * drivers/media/video/omap/omap1510cam.c
+ * drivers/media/platform/omap/omap1510cam.c
  * Copyright (C) 2006 Matt Callow
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/trunk/drivers/media/video/omap24xxcam-dma.c → .../drivers/media/platform/omap24xxcam-dma.c b/trunk/drivers/media/video/omap24xxcam-dma.c → .../drivers/media/platform/omap24xxcam-dma.c
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/omap24xxcam-dma.c
+ * drivers/media/platform/omap24xxcam-dma.c
  *
  * Copyright (C) 2004 MontaVista Software, Inc.
  * Copyright (C) 2004 Texas Instruments.

diff --git a/trunk/drivers/media/video/omap24xxcam.c → trunk/drivers/media/platform/omap24xxcam.c b/trunk/drivers/media/video/omap24xxcam.c → trunk/drivers/media/platform/omap24xxcam.c
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/omap24xxcam.c
+ * drivers/media/platform/omap24xxcam.c
  *
  * OMAP 2 camera block driver.
  *

diff --git a/trunk/drivers/media/video/omap24xxcam.h → trunk/drivers/media/platform/omap24xxcam.h b/trunk/drivers/media/video/omap24xxcam.h → trunk/drivers/media/platform/omap24xxcam.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/omap24xxcam.h
+ * drivers/media/platform/omap24xxcam.h
  *
  * Copyright (C) 2004 MontaVista Software, Inc.
  * Copyright (C) 2004 Texas Instruments.

diff --git a/trunk/drivers/media/video/omap3isp/Makefile → .../drivers/media/platform/omap3isp/Makefile b/trunk/drivers/media/video/omap3isp/Makefile → .../drivers/media/platform/omap3isp/Makefile
diff --git a/...ers/media/video/omap3isp/cfa_coef_table.h → .../media/platform/omap3isp/cfa_coef_table.h b/...ers/media/video/omap3isp/cfa_coef_table.h → .../media/platform/omap3isp/cfa_coef_table.h
diff --git a/...rivers/media/video/omap3isp/gamma_table.h → ...ers/media/platform/omap3isp/gamma_table.h b/...rivers/media/video/omap3isp/gamma_table.h → ...ers/media/platform/omap3isp/gamma_table.h
diff --git a/trunk/drivers/media/video/omap3isp/isp.c → trunk/drivers/media/platform/omap3isp/isp.c b/trunk/drivers/media/video/omap3isp/isp.c → trunk/drivers/media/platform/omap3isp/isp.c
diff --git a/trunk/drivers/media/video/omap3isp/isp.h → trunk/drivers/media/platform/omap3isp/isp.h b/trunk/drivers/media/video/omap3isp/isp.h → trunk/drivers/media/platform/omap3isp/isp.h
diff --git a/trunk/drivers/media/video/omap3isp/ispccdc.c → ...drivers/media/platform/omap3isp/ispccdc.c b/trunk/drivers/media/video/omap3isp/ispccdc.c → ...drivers/media/platform/omap3isp/ispccdc.c
diff --git a/trunk/drivers/media/video/omap3isp/ispccdc.h → ...drivers/media/platform/omap3isp/ispccdc.h b/trunk/drivers/media/video/omap3isp/ispccdc.h → ...drivers/media/platform/omap3isp/ispccdc.h
diff --git a/trunk/drivers/media/video/omap3isp/ispccp2.c → ...drivers/media/platform/omap3isp/ispccp2.c b/trunk/drivers/media/video/omap3isp/ispccp2.c → ...drivers/media/platform/omap3isp/ispccp2.c
diff --git a/trunk/drivers/media/video/omap3isp/ispccp2.h → ...drivers/media/platform/omap3isp/ispccp2.h b/trunk/drivers/media/video/omap3isp/ispccp2.h → ...drivers/media/platform/omap3isp/ispccp2.h
diff --git a/trunk/drivers/media/video/omap3isp/ispcsi2.c → ...drivers/media/platform/omap3isp/ispcsi2.c b/trunk/drivers/media/video/omap3isp/ispcsi2.c → ...drivers/media/platform/omap3isp/ispcsi2.c
diff --git a/trunk/drivers/media/video/omap3isp/ispcsi2.h → ...drivers/media/platform/omap3isp/ispcsi2.h b/trunk/drivers/media/video/omap3isp/ispcsi2.h → ...drivers/media/platform/omap3isp/ispcsi2.h
diff --git a/.../drivers/media/video/omap3isp/ispcsiphy.c → ...ivers/media/platform/omap3isp/ispcsiphy.c b/.../drivers/media/video/omap3isp/ispcsiphy.c → ...ivers/media/platform/omap3isp/ispcsiphy.c
diff --git a/.../drivers/media/video/omap3isp/ispcsiphy.h → ...ivers/media/platform/omap3isp/ispcsiphy.h b/.../drivers/media/video/omap3isp/ispcsiphy.h → ...ivers/media/platform/omap3isp/ispcsiphy.h
diff --git a/trunk/drivers/media/video/omap3isp/isph3a.h → .../drivers/media/platform/omap3isp/isph3a.h b/trunk/drivers/media/video/omap3isp/isph3a.h → .../drivers/media/platform/omap3isp/isph3a.h
diff --git a/...rivers/media/video/omap3isp/isph3a_aewb.c → ...ers/media/platform/omap3isp/isph3a_aewb.c b/...rivers/media/video/omap3isp/isph3a_aewb.c → ...ers/media/platform/omap3isp/isph3a_aewb.c
diff --git a/.../drivers/media/video/omap3isp/isph3a_af.c → ...ivers/media/platform/omap3isp/isph3a_af.c b/.../drivers/media/video/omap3isp/isph3a_af.c → ...ivers/media/platform/omap3isp/isph3a_af.c
diff --git a/trunk/drivers/media/video/omap3isp/isphist.c → ...drivers/media/platform/omap3isp/isphist.c b/trunk/drivers/media/video/omap3isp/isphist.c → ...drivers/media/platform/omap3isp/isphist.c
diff --git a/trunk/drivers/media/video/omap3isp/isphist.h → ...drivers/media/platform/omap3isp/isphist.h b/trunk/drivers/media/video/omap3isp/isphist.h → ...drivers/media/platform/omap3isp/isphist.h
diff --git a/...drivers/media/video/omap3isp/isppreview.c → ...vers/media/platform/omap3isp/isppreview.c b/...drivers/media/video/omap3isp/isppreview.c → ...vers/media/platform/omap3isp/isppreview.c
diff --git a/...drivers/media/video/omap3isp/isppreview.h → ...vers/media/platform/omap3isp/isppreview.h b/...drivers/media/video/omap3isp/isppreview.h → ...vers/media/platform/omap3isp/isppreview.h
diff --git a/...k/drivers/media/video/omap3isp/ispqueue.c → ...rivers/media/platform/omap3isp/ispqueue.c b/...k/drivers/media/video/omap3isp/ispqueue.c → ...rivers/media/platform/omap3isp/ispqueue.c
diff --git a/...k/drivers/media/video/omap3isp/ispqueue.h → ...rivers/media/platform/omap3isp/ispqueue.h b/...k/drivers/media/video/omap3isp/ispqueue.h → ...rivers/media/platform/omap3isp/ispqueue.h
diff --git a/trunk/drivers/media/video/omap3isp/ispreg.h → .../drivers/media/platform/omap3isp/ispreg.h b/trunk/drivers/media/video/omap3isp/ispreg.h → .../drivers/media/platform/omap3isp/ispreg.h
diff --git a/...drivers/media/video/omap3isp/ispresizer.c → ...vers/media/platform/omap3isp/ispresizer.c b/...drivers/media/video/omap3isp/ispresizer.c → ...vers/media/platform/omap3isp/ispresizer.c
diff --git a/...drivers/media/video/omap3isp/ispresizer.h → ...vers/media/platform/omap3isp/ispresizer.h b/...drivers/media/video/omap3isp/ispresizer.h → ...vers/media/platform/omap3isp/ispresizer.h
diff --git a/trunk/drivers/media/video/omap3isp/ispstat.c → ...drivers/media/platform/omap3isp/ispstat.c b/trunk/drivers/media/video/omap3isp/ispstat.c → ...drivers/media/platform/omap3isp/ispstat.c
diff --git a/trunk/drivers/media/video/omap3isp/ispstat.h → ...drivers/media/platform/omap3isp/ispstat.h b/trunk/drivers/media/video/omap3isp/ispstat.h → ...drivers/media/platform/omap3isp/ispstat.h
diff --git a/...k/drivers/media/video/omap3isp/ispvideo.c → ...rivers/media/platform/omap3isp/ispvideo.c b/...k/drivers/media/video/omap3isp/ispvideo.c → ...rivers/media/platform/omap3isp/ispvideo.c
diff --git a/...k/drivers/media/video/omap3isp/ispvideo.h → ...rivers/media/platform/omap3isp/ispvideo.h b/...k/drivers/media/video/omap3isp/ispvideo.h → ...rivers/media/platform/omap3isp/ispvideo.h
diff --git a/...media/video/omap3isp/luma_enhance_table.h → ...ia/platform/omap3isp/luma_enhance_table.h b/...media/video/omap3isp/luma_enhance_table.h → ...ia/platform/omap3isp/luma_enhance_table.h
diff --git a/...media/video/omap3isp/noise_filter_table.h → ...ia/platform/omap3isp/noise_filter_table.h b/...media/video/omap3isp/noise_filter_table.h → ...ia/platform/omap3isp/noise_filter_table.h
diff --git a/trunk/drivers/media/video/pxa_camera.c → trunk/drivers/media/platform/pxa_camera.c b/trunk/drivers/media/video/pxa_camera.c → trunk/drivers/media/platform/pxa_camera.c
diff --git a/trunk/drivers/media/video/s5p-fimc/Kconfig → ...k/drivers/media/platform/s5p-fimc/Kconfig b/trunk/drivers/media/video/s5p-fimc/Kconfig → ...k/drivers/media/platform/s5p-fimc/Kconfig
diff --git a/trunk/drivers/media/video/s5p-fimc/Makefile → .../drivers/media/platform/s5p-fimc/Makefile b/trunk/drivers/media/video/s5p-fimc/Makefile → .../drivers/media/platform/s5p-fimc/Makefile
diff --git a/...ivers/media/video/s5p-fimc/fimc-capture.c → ...rs/media/platform/s5p-fimc/fimc-capture.c b/...ivers/media/video/s5p-fimc/fimc-capture.c → ...rs/media/platform/s5p-fimc/fimc-capture.c
diff --git a/.../drivers/media/video/s5p-fimc/fimc-core.c → ...ivers/media/platform/s5p-fimc/fimc-core.c b/.../drivers/media/video/s5p-fimc/fimc-core.c → ...ivers/media/platform/s5p-fimc/fimc-core.c
diff --git a/.../drivers/media/video/s5p-fimc/fimc-core.h → ...ivers/media/platform/s5p-fimc/fimc-core.h b/.../drivers/media/video/s5p-fimc/fimc-core.h → ...ivers/media/platform/s5p-fimc/fimc-core.h
diff --git a/...vers/media/video/s5p-fimc/fimc-lite-reg.c → ...s/media/platform/s5p-fimc/fimc-lite-reg.c b/...vers/media/video/s5p-fimc/fimc-lite-reg.c → ...s/media/platform/s5p-fimc/fimc-lite-reg.c
diff --git a/...vers/media/video/s5p-fimc/fimc-lite-reg.h → ...s/media/platform/s5p-fimc/fimc-lite-reg.h b/...vers/media/video/s5p-fimc/fimc-lite-reg.h → ...s/media/platform/s5p-fimc/fimc-lite-reg.h
diff --git a/.../drivers/media/video/s5p-fimc/fimc-lite.c → ...ivers/media/platform/s5p-fimc/fimc-lite.c b/.../drivers/media/video/s5p-fimc/fimc-lite.c → ...ivers/media/platform/s5p-fimc/fimc-lite.c
diff --git a/.../drivers/media/video/s5p-fimc/fimc-lite.h → ...ivers/media/platform/s5p-fimc/fimc-lite.h b/.../drivers/media/video/s5p-fimc/fimc-lite.h → ...ivers/media/platform/s5p-fimc/fimc-lite.h
diff --git a/...k/drivers/media/video/s5p-fimc/fimc-m2m.c → ...rivers/media/platform/s5p-fimc/fimc-m2m.c b/...k/drivers/media/video/s5p-fimc/fimc-m2m.c → ...rivers/media/platform/s5p-fimc/fimc-m2m.c
diff --git a/...ivers/media/video/s5p-fimc/fimc-mdevice.c → ...rs/media/platform/s5p-fimc/fimc-mdevice.c b/...ivers/media/video/s5p-fimc/fimc-mdevice.c → ...rs/media/platform/s5p-fimc/fimc-mdevice.c
diff --git a/...ivers/media/video/s5p-fimc/fimc-mdevice.h → ...rs/media/platform/s5p-fimc/fimc-mdevice.h b/...ivers/media/video/s5p-fimc/fimc-mdevice.h → ...rs/media/platform/s5p-fimc/fimc-mdevice.h
diff --git a/...k/drivers/media/video/s5p-fimc/fimc-reg.c → ...rivers/media/platform/s5p-fimc/fimc-reg.c b/...k/drivers/media/video/s5p-fimc/fimc-reg.c → ...rivers/media/platform/s5p-fimc/fimc-reg.c
diff --git a/...k/drivers/media/video/s5p-fimc/fimc-reg.h → ...rivers/media/platform/s5p-fimc/fimc-reg.h b/...k/drivers/media/video/s5p-fimc/fimc-reg.h → ...rivers/media/platform/s5p-fimc/fimc-reg.h
diff --git a/.../drivers/media/video/s5p-fimc/mipi-csis.c → ...ivers/media/platform/s5p-fimc/mipi-csis.c b/.../drivers/media/video/s5p-fimc/mipi-csis.c → ...ivers/media/platform/s5p-fimc/mipi-csis.c
diff --git a/.../drivers/media/video/s5p-fimc/mipi-csis.h → ...ivers/media/platform/s5p-fimc/mipi-csis.h b/.../drivers/media/video/s5p-fimc/mipi-csis.h → ...ivers/media/platform/s5p-fimc/mipi-csis.h
diff --git a/trunk/drivers/media/video/s5p-g2d/Makefile → ...k/drivers/media/platform/s5p-g2d/Makefile b/trunk/drivers/media/video/s5p-g2d/Makefile → ...k/drivers/media/platform/s5p-g2d/Makefile
diff --git a/trunk/drivers/media/video/s5p-g2d/g2d-hw.c → ...k/drivers/media/platform/s5p-g2d/g2d-hw.c b/trunk/drivers/media/video/s5p-g2d/g2d-hw.c → ...k/drivers/media/platform/s5p-g2d/g2d-hw.c
diff --git a/trunk/drivers/media/video/s5p-g2d/g2d-regs.h → ...drivers/media/platform/s5p-g2d/g2d-regs.h b/trunk/drivers/media/video/s5p-g2d/g2d-regs.h → ...drivers/media/platform/s5p-g2d/g2d-regs.h
diff --git a/trunk/drivers/media/video/s5p-g2d/g2d.c → trunk/drivers/media/platform/s5p-g2d/g2d.c b/trunk/drivers/media/video/s5p-g2d/g2d.c → trunk/drivers/media/platform/s5p-g2d/g2d.c
diff --git a/trunk/drivers/media/video/s5p-g2d/g2d.h → trunk/drivers/media/platform/s5p-g2d/g2d.h b/trunk/drivers/media/video/s5p-g2d/g2d.h → trunk/drivers/media/platform/s5p-g2d/g2d.h
diff --git a/trunk/drivers/media/video/s5p-jpeg/Makefile → .../drivers/media/platform/s5p-jpeg/Makefile b/trunk/drivers/media/video/s5p-jpeg/Makefile → .../drivers/media/platform/s5p-jpeg/Makefile
diff --git a/.../drivers/media/video/s5p-jpeg/jpeg-core.c → ...ivers/media/platform/s5p-jpeg/jpeg-core.c b/.../drivers/media/video/s5p-jpeg/jpeg-core.c → ...ivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1,4 +1,4 @@
-/* linux/drivers/media/video/s5p-jpeg/jpeg-core.c
+/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.c
  *
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com

diff --git a/.../drivers/media/video/s5p-jpeg/jpeg-core.h → ...ivers/media/platform/s5p-jpeg/jpeg-core.h b/.../drivers/media/video/s5p-jpeg/jpeg-core.h → ...ivers/media/platform/s5p-jpeg/jpeg-core.h
@@ -1,4 +1,4 @@
-/* linux/drivers/media/video/s5p-jpeg/jpeg-core.h
+/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.h
  *
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com

diff --git a/trunk/drivers/media/video/s5p-jpeg/jpeg-hw.h → ...drivers/media/platform/s5p-jpeg/jpeg-hw.h b/trunk/drivers/media/video/s5p-jpeg/jpeg-hw.h → ...drivers/media/platform/s5p-jpeg/jpeg-hw.h
@@ -1,4 +1,4 @@
-/* linux/drivers/media/video/s5p-jpeg/jpeg-hw.h
+/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h
  *
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com

diff --git a/.../drivers/media/video/s5p-jpeg/jpeg-regs.h → ...ivers/media/platform/s5p-jpeg/jpeg-regs.h b/.../drivers/media/video/s5p-jpeg/jpeg-regs.h → ...ivers/media/platform/s5p-jpeg/jpeg-regs.h
@@ -1,4 +1,4 @@
-/* linux/drivers/media/video/s5p-jpeg/jpeg-regs.h
+/* linux/drivers/media/platform/s5p-jpeg/jpeg-regs.h
  *
  * Register definition file for Samsung JPEG codec driver
  *

diff --git a/trunk/drivers/media/video/s5p-mfc/Makefile → ...k/drivers/media/platform/s5p-mfc/Makefile b/trunk/drivers/media/video/s5p-mfc/Makefile → ...k/drivers/media/platform/s5p-mfc/Makefile
diff --git a/trunk/drivers/media/video/s5p-mfc/regs-mfc.h → ...drivers/media/platform/s5p-mfc/regs-mfc.h b/trunk/drivers/media/video/s5p-mfc/regs-mfc.h → ...drivers/media/platform/s5p-mfc/regs-mfc.h
diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c → .../drivers/media/platform/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c → .../drivers/media/platform/s5p-mfc/s5p_mfc.c
diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_cmd.c → ...vers/media/platform/s5p-mfc/s5p_mfc_cmd.c b/...drivers/media/video/s5p-mfc/s5p_mfc_cmd.c → ...vers/media/platform/s5p-mfc/s5p_mfc_cmd.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_cmd.c
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
  *
  * Copyright (C) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_cmd.h → ...vers/media/platform/s5p-mfc/s5p_mfc_cmd.h b/...drivers/media/video/s5p-mfc/s5p_mfc_cmd.h → ...vers/media/platform/s5p-mfc/s5p_mfc_cmd.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_cmd.h
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
  *
  * Copyright (C) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...vers/media/video/s5p-mfc/s5p_mfc_common.h → ...s/media/platform/s5p-mfc/s5p_mfc_common.h b/...vers/media/video/s5p-mfc/s5p_mfc_common.h → ...s/media/platform/s5p-mfc/s5p_mfc_common.h
diff --git a/...rivers/media/video/s5p-mfc/s5p_mfc_ctrl.c → ...ers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/...rivers/media/video/s5p-mfc/s5p_mfc_ctrl.c → ...ers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
  *
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...rivers/media/video/s5p-mfc/s5p_mfc_ctrl.h → ...ers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/...rivers/media/video/s5p-mfc/s5p_mfc_ctrl.h → ...ers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.h
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
  *
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...ivers/media/video/s5p-mfc/s5p_mfc_debug.h → ...rs/media/platform/s5p-mfc/s5p_mfc_debug.h b/...ivers/media/video/s5p-mfc/s5p_mfc_debug.h → ...rs/media/platform/s5p-mfc/s5p_mfc_debug.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/samsung/mfc5/s5p_mfc_debug.h
+ * drivers/media/platform/samsung/mfc5/s5p_mfc_debug.h
  *
  * Header file for Samsung MFC (Multi Function Codec - FIMV) driver
  * This file contains debug macros

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_dec.c → ...vers/media/platform/s5p-mfc/s5p_mfc_dec.c b/...drivers/media/video/s5p-mfc/s5p_mfc_dec.c → ...vers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
  *
  * Copyright (C) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_dec.h → ...vers/media/platform/s5p-mfc/s5p_mfc_dec.h b/...drivers/media/video/s5p-mfc/s5p_mfc_dec.h → ...vers/media/platform/s5p-mfc/s5p_mfc_dec.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_dec.h
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
  *
  * Copyright (C) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_enc.c → ...vers/media/platform/s5p-mfc/s5p_mfc_enc.c b/...drivers/media/video/s5p-mfc/s5p_mfc_enc.c → ...vers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
  *
  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_enc.h → ...vers/media/platform/s5p-mfc/s5p_mfc_enc.h b/...drivers/media/video/s5p-mfc/s5p_mfc_enc.h → ...vers/media/platform/s5p-mfc/s5p_mfc_enc.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_enc.h
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
  *
  * Copyright (C) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...rivers/media/video/s5p-mfc/s5p_mfc_intr.c → ...ers/media/platform/s5p-mfc/s5p_mfc_intr.c b/...rivers/media/video/s5p-mfc/s5p_mfc_intr.c → ...ers/media/platform/s5p-mfc/s5p_mfc_intr.c
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/samsung/mfc5/s5p_mfc_intr.c
+ * drivers/media/platform/samsung/mfc5/s5p_mfc_intr.c
  *
  * C file for Samsung MFC (Multi Function Codec - FIMV) driver
  * This file contains functions used to wait for command completion.

diff --git a/...rivers/media/video/s5p-mfc/s5p_mfc_intr.h → ...ers/media/platform/s5p-mfc/s5p_mfc_intr.h b/...rivers/media/video/s5p-mfc/s5p_mfc_intr.h → ...ers/media/platform/s5p-mfc/s5p_mfc_intr.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/samsung/mfc5/s5p_mfc_intr.h
+ * drivers/media/platform/samsung/mfc5/s5p_mfc_intr.h
  *
  * Header file for Samsung MFC (Multi Function Codec - FIMV) driver
  * It contains waiting functions declarations.

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_opr.c → ...vers/media/platform/s5p-mfc/s5p_mfc_opr.c b/...drivers/media/video/s5p-mfc/s5p_mfc_opr.c → ...vers/media/platform/s5p-mfc/s5p_mfc_opr.c
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/samsung/mfc5/s5p_mfc_opr.c
+ * drivers/media/platform/samsung/mfc5/s5p_mfc_opr.c
  *
  * Samsung MFC (Multi Function Codec - FIMV) driver
  * This file contains hw related functions.

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_opr.h → ...vers/media/platform/s5p-mfc/s5p_mfc_opr.h b/...drivers/media/video/s5p-mfc/s5p_mfc_opr.h → ...vers/media/platform/s5p-mfc/s5p_mfc_opr.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/video/samsung/mfc5/s5p_mfc_opr.h
+ * drivers/media/platform/samsung/mfc5/s5p_mfc_opr.h
  *
  * Header file for Samsung MFC (Multi Function Codec - FIMV) driver
  * Contains declarations of hw related functions.

diff --git a/.../drivers/media/video/s5p-mfc/s5p_mfc_pm.c → ...ivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/.../drivers/media/video/s5p-mfc/s5p_mfc_pm.c → ...ivers/media/platform/s5p-mfc/s5p_mfc_pm.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_pm.c
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
  *
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/.../drivers/media/video/s5p-mfc/s5p_mfc_pm.h → ...ivers/media/platform/s5p-mfc/s5p_mfc_pm.h b/.../drivers/media/video/s5p-mfc/s5p_mfc_pm.h → ...ivers/media/platform/s5p-mfc/s5p_mfc_pm.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_pm.h
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
  *
  * Copyright (C) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_shm.c → ...vers/media/platform/s5p-mfc/s5p_mfc_shm.c b/...drivers/media/video/s5p-mfc/s5p_mfc_shm.c → ...vers/media/platform/s5p-mfc/s5p_mfc_shm.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_shm.c
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
  *
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/...drivers/media/video/s5p-mfc/s5p_mfc_shm.h → ...vers/media/platform/s5p-mfc/s5p_mfc_shm.h b/...drivers/media/video/s5p-mfc/s5p_mfc_shm.h → ...vers/media/platform/s5p-mfc/s5p_mfc_shm.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/media/video/s5p-mfc/s5p_mfc_shm.h
+ * linux/drivers/media/platform/s5p-mfc/s5p_mfc_shm.h
  *
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/trunk/drivers/media/video/s5p-tv/Kconfig → trunk/drivers/media/platform/s5p-tv/Kconfig b/trunk/drivers/media/video/s5p-tv/Kconfig → trunk/drivers/media/platform/s5p-tv/Kconfig
@@ -1,4 +1,4 @@
-# drivers/media/video/s5p-tv/Kconfig
+# drivers/media/platform/s5p-tv/Kconfig
 #
 # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
 #	http://www.samsung.com/

diff --git a/trunk/drivers/media/video/s5p-tv/Makefile → trunk/drivers/media/platform/s5p-tv/Makefile b/trunk/drivers/media/video/s5p-tv/Makefile → trunk/drivers/media/platform/s5p-tv/Makefile
@@ -1,4 +1,4 @@
-# drivers/media/video/samsung/tvout/Makefile
+# drivers/media/platform/samsung/tvout/Makefile
 #
 # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
 #	http://www.samsung.com/

diff --git a/trunk/drivers/media/video/s5p-tv/hdmi_drv.c → .../drivers/media/platform/s5p-tv/hdmi_drv.c b/trunk/drivers/media/video/s5p-tv/hdmi_drv.c → .../drivers/media/platform/s5p-tv/hdmi_drv.c
diff --git a/.../drivers/media/video/s5p-tv/hdmiphy_drv.c → ...ivers/media/platform/s5p-tv/hdmiphy_drv.c b/.../drivers/media/video/s5p-tv/hdmiphy_drv.c → ...ivers/media/platform/s5p-tv/hdmiphy_drv.c
diff --git a/trunk/drivers/media/video/s5p-tv/mixer.h → trunk/drivers/media/platform/s5p-tv/mixer.h b/trunk/drivers/media/video/s5p-tv/mixer.h → trunk/drivers/media/platform/s5p-tv/mixer.h
diff --git a/trunk/drivers/media/video/s5p-tv/mixer_drv.c → ...drivers/media/platform/s5p-tv/mixer_drv.c b/trunk/drivers/media/video/s5p-tv/mixer_drv.c → ...drivers/media/platform/s5p-tv/mixer_drv.c
diff --git a/...vers/media/video/s5p-tv/mixer_grp_layer.c → ...s/media/platform/s5p-tv/mixer_grp_layer.c b/...vers/media/video/s5p-tv/mixer_grp_layer.c → ...s/media/platform/s5p-tv/mixer_grp_layer.c
diff --git a/trunk/drivers/media/video/s5p-tv/mixer_reg.c → ...drivers/media/platform/s5p-tv/mixer_reg.c b/trunk/drivers/media/video/s5p-tv/mixer_reg.c → ...drivers/media/platform/s5p-tv/mixer_reg.c
diff --git a/.../drivers/media/video/s5p-tv/mixer_video.c → ...ivers/media/platform/s5p-tv/mixer_video.c b/.../drivers/media/video/s5p-tv/mixer_video.c → ...ivers/media/platform/s5p-tv/mixer_video.c
diff --git a/...ivers/media/video/s5p-tv/mixer_vp_layer.c → ...rs/media/platform/s5p-tv/mixer_vp_layer.c b/...ivers/media/video/s5p-tv/mixer_vp_layer.c → ...rs/media/platform/s5p-tv/mixer_vp_layer.c
diff --git a/trunk/drivers/media/video/s5p-tv/regs-hdmi.h → ...drivers/media/platform/s5p-tv/regs-hdmi.h b/trunk/drivers/media/video/s5p-tv/regs-hdmi.h → ...drivers/media/platform/s5p-tv/regs-hdmi.h
diff --git a/...k/drivers/media/video/s5p-tv/regs-mixer.h → ...rivers/media/platform/s5p-tv/regs-mixer.h b/...k/drivers/media/video/s5p-tv/regs-mixer.h → ...rivers/media/platform/s5p-tv/regs-mixer.h
diff --git a/trunk/drivers/media/video/s5p-tv/regs-sdo.h → .../drivers/media/platform/s5p-tv/regs-sdo.h b/trunk/drivers/media/video/s5p-tv/regs-sdo.h → .../drivers/media/platform/s5p-tv/regs-sdo.h
@@ -1,4 +1,4 @@
-/* drivers/media/video/s5p-tv/regs-sdo.h
+/* drivers/media/platform/s5p-tv/regs-sdo.h
  *
  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/

diff --git a/trunk/drivers/media/video/s5p-tv/regs-vp.h → ...k/drivers/media/platform/s5p-tv/regs-vp.h b/trunk/drivers/media/video/s5p-tv/regs-vp.h → ...k/drivers/media/platform/s5p-tv/regs-vp.h
diff --git a/trunk/drivers/media/video/s5p-tv/sdo_drv.c → ...k/drivers/media/platform/s5p-tv/sdo_drv.c b/trunk/drivers/media/video/s5p-tv/sdo_drv.c → ...k/drivers/media/platform/s5p-tv/sdo_drv.c
diff --git a/.../drivers/media/video/s5p-tv/sii9234_drv.c → ...ivers/media/platform/s5p-tv/sii9234_drv.c b/.../drivers/media/video/s5p-tv/sii9234_drv.c → ...ivers/media/platform/s5p-tv/sii9234_drv.c
diff --git a/...rivers/media/video/sh_mobile_ceu_camera.c → ...ers/media/platform/sh_mobile_ceu_camera.c b/...rivers/media/video/sh_mobile_ceu_camera.c → ...ers/media/platform/sh_mobile_ceu_camera.c
diff --git a/trunk/drivers/media/video/sh_vou.c → trunk/drivers/media/platform/sh_vou.c b/trunk/drivers/media/video/sh_vou.c → trunk/drivers/media/platform/sh_vou.c
diff --git a/...drivers/media/i2c/soc_camera/soc_camera.c → trunk/drivers/media/platform/soc_camera.c b/...drivers/media/i2c/soc_camera/soc_camera.c → trunk/drivers/media/platform/soc_camera.c
diff --git a/...drivers/media/video/soc_camera_platform.c → ...vers/media/platform/soc_camera_platform.c b/...drivers/media/video/soc_camera_platform.c → ...vers/media/platform/soc_camera_platform.c
diff --git a/trunk/drivers/media/video/soc_mediabus.c → trunk/drivers/media/platform/soc_mediabus.c b/trunk/drivers/media/video/soc_mediabus.c → trunk/drivers/media/platform/soc_mediabus.c
diff --git a/trunk/drivers/media/video/timblogiw.c → trunk/drivers/media/platform/timblogiw.c b/trunk/drivers/media/video/timblogiw.c → trunk/drivers/media/platform/timblogiw.c
diff --git a/trunk/drivers/media/video/via-camera.c → trunk/drivers/media/platform/via-camera.c b/trunk/drivers/media/video/via-camera.c → trunk/drivers/media/platform/via-camera.c
diff --git a/trunk/drivers/media/video/via-camera.h → trunk/drivers/media/platform/via-camera.h b/trunk/drivers/media/video/via-camera.h → trunk/drivers/media/platform/via-camera.h
diff --git a/trunk/drivers/media/video/vino.c → trunk/drivers/media/platform/vino.c b/trunk/drivers/media/video/vino.c → trunk/drivers/media/platform/vino.c
diff --git a/trunk/drivers/media/video/vino.h → trunk/drivers/media/platform/vino.h b/trunk/drivers/media/video/vino.h → trunk/drivers/media/platform/vino.h
diff --git a/trunk/drivers/media/video/vivi.c → trunk/drivers/media/platform/vivi.c b/trunk/drivers/media/video/vivi.c → trunk/drivers/media/platform/vivi.c