diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/platform/Kconfig (renamed from drivers/media/video/Kconfig) | 12 | ||||
-rw-r--r-- | drivers/media/platform/Makefile (renamed from drivers/media/video/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/arv.c (renamed from drivers/media/video/arv.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/atmel-isi.c (renamed from drivers/media/video/atmel-isi.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/blackfin/Kconfig (renamed from drivers/media/video/blackfin/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/platform/blackfin/Makefile (renamed from drivers/media/video/blackfin/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/blackfin/bfin_capture.c (renamed from drivers/media/video/blackfin/bfin_capture.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/blackfin/ppi.c (renamed from drivers/media/video/blackfin/ppi.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/coda.c (renamed from drivers/media/video/coda.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/coda.h (renamed from drivers/media/video/coda.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/davinci/Kconfig (renamed from drivers/media/video/davinci/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/Makefile (renamed from drivers/media/video/davinci/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/ccdc_hw_device.h (renamed from drivers/media/video/davinci/ccdc_hw_device.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/dm355_ccdc.c (renamed from drivers/media/video/davinci/dm355_ccdc.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/dm355_ccdc_regs.h (renamed from drivers/media/video/davinci/dm355_ccdc_regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/dm644x_ccdc.c (renamed from drivers/media/video/davinci/dm644x_ccdc.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/dm644x_ccdc_regs.h (renamed from drivers/media/video/davinci/dm644x_ccdc_regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/isif.c (renamed from drivers/media/video/davinci/isif.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/isif_regs.h (renamed from drivers/media/video/davinci/isif_regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpbe.c (renamed from drivers/media/video/davinci/vpbe.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpbe_display.c (renamed from drivers/media/video/davinci/vpbe_display.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpbe_osd.c (renamed from drivers/media/video/davinci/vpbe_osd.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpbe_osd_regs.h (renamed from drivers/media/video/davinci/vpbe_osd_regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpbe_venc.c (renamed from drivers/media/video/davinci/vpbe_venc.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpbe_venc_regs.h (renamed from drivers/media/video/davinci/vpbe_venc_regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpfe_capture.c (renamed from drivers/media/video/davinci/vpfe_capture.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpif.c (renamed from drivers/media/video/davinci/vpif.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpif.h (renamed from drivers/media/video/davinci/vpif.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c (renamed from drivers/media/video/davinci/vpif_capture.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpif_capture.h (renamed from drivers/media/video/davinci/vpif_capture.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpif_display.c (renamed from drivers/media/video/davinci/vpif_display.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpif_display.h (renamed from drivers/media/video/davinci/vpif_display.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpss.c (renamed from drivers/media/video/davinci/vpss.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/fsl-viu.c (renamed from drivers/media/video/fsl-viu.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/indycam.c (renamed from drivers/media/video/indycam.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/indycam.h (renamed from drivers/media/video/indycam.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/m2m-deinterlace.c (renamed from drivers/media/video/m2m-deinterlace.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/Kconfig (renamed from drivers/media/video/marvell-ccic/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/Makefile (renamed from drivers/media/video/marvell-ccic/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/cafe-driver.c (renamed from drivers/media/video/marvell-ccic/cafe-driver.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/mcam-core.c (renamed from drivers/media/video/marvell-ccic/mcam-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/mcam-core.h (renamed from drivers/media/video/marvell-ccic/mcam-core.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/mmp-driver.c (renamed from drivers/media/video/marvell-ccic/mmp-driver.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/mem2mem_testdev.c (renamed from drivers/media/video/mem2mem_testdev.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/mx1_camera.c (renamed from drivers/media/video/mx1_camera.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/mx2_camera.c (renamed from drivers/media/video/mx2_camera.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/mx2_emmaprp.c (renamed from drivers/media/video/mx2_emmaprp.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/mx3_camera.c (renamed from drivers/media/video/mx3_camera.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/Kconfig (renamed from drivers/media/video/omap/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/Makefile (renamed from drivers/media/video/omap/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_vout.c (renamed from drivers/media/video/omap/omap_vout.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.c (renamed from drivers/media/video/omap/omap_vout_vrfb.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.h (renamed from drivers/media/video/omap/omap_vout_vrfb.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_voutdef.h (renamed from drivers/media/video/omap/omap_voutdef.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_voutlib.c (renamed from drivers/media/video/omap/omap_voutlib.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap/omap_voutlib.h (renamed from drivers/media/video/omap/omap_voutlib.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap1_camera.c (renamed from drivers/media/video/omap1_camera.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/omap24xxcam-dma.c (renamed from drivers/media/video/omap24xxcam-dma.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/omap24xxcam.c (renamed from drivers/media/video/omap24xxcam.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/omap24xxcam.h (renamed from drivers/media/video/omap24xxcam.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/Makefile (renamed from drivers/media/video/omap3isp/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/cfa_coef_table.h (renamed from drivers/media/video/omap3isp/cfa_coef_table.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/gamma_table.h (renamed from drivers/media/video/omap3isp/gamma_table.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isp.c (renamed from drivers/media/video/omap3isp/isp.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isp.h (renamed from drivers/media/video/omap3isp/isp.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispccdc.c (renamed from drivers/media/video/omap3isp/ispccdc.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispccdc.h (renamed from drivers/media/video/omap3isp/ispccdc.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispccp2.c (renamed from drivers/media/video/omap3isp/ispccp2.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispccp2.h (renamed from drivers/media/video/omap3isp/ispccp2.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispcsi2.c (renamed from drivers/media/video/omap3isp/ispcsi2.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispcsi2.h (renamed from drivers/media/video/omap3isp/ispcsi2.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispcsiphy.c (renamed from drivers/media/video/omap3isp/ispcsiphy.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispcsiphy.h (renamed from drivers/media/video/omap3isp/ispcsiphy.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isph3a.h (renamed from drivers/media/video/omap3isp/isph3a.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isph3a_aewb.c (renamed from drivers/media/video/omap3isp/isph3a_aewb.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isph3a_af.c (renamed from drivers/media/video/omap3isp/isph3a_af.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isphist.c (renamed from drivers/media/video/omap3isp/isphist.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isphist.h (renamed from drivers/media/video/omap3isp/isphist.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isppreview.c (renamed from drivers/media/video/omap3isp/isppreview.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isppreview.h (renamed from drivers/media/video/omap3isp/isppreview.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispqueue.c (renamed from drivers/media/video/omap3isp/ispqueue.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispqueue.h (renamed from drivers/media/video/omap3isp/ispqueue.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispreg.h (renamed from drivers/media/video/omap3isp/ispreg.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispresizer.c (renamed from drivers/media/video/omap3isp/ispresizer.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispresizer.h (renamed from drivers/media/video/omap3isp/ispresizer.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispstat.c (renamed from drivers/media/video/omap3isp/ispstat.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispstat.h (renamed from drivers/media/video/omap3isp/ispstat.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c (renamed from drivers/media/video/omap3isp/ispvideo.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.h (renamed from drivers/media/video/omap3isp/ispvideo.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/luma_enhance_table.h (renamed from drivers/media/video/omap3isp/luma_enhance_table.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/noise_filter_table.h (renamed from drivers/media/video/omap3isp/noise_filter_table.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/pxa_camera.c (renamed from drivers/media/video/pxa_camera.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/Kconfig (renamed from drivers/media/video/s5p-fimc/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/Makefile (renamed from drivers/media/video/s5p-fimc/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-capture.c (renamed from drivers/media/video/s5p-fimc/fimc-capture.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-core.c (renamed from drivers/media/video/s5p-fimc/fimc-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-core.h (renamed from drivers/media/video/s5p-fimc/fimc-core.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-lite-reg.c (renamed from drivers/media/video/s5p-fimc/fimc-lite-reg.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-lite-reg.h (renamed from drivers/media/video/s5p-fimc/fimc-lite-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-lite.c (renamed from drivers/media/video/s5p-fimc/fimc-lite.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-lite.h (renamed from drivers/media/video/s5p-fimc/fimc-lite.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-m2m.c (renamed from drivers/media/video/s5p-fimc/fimc-m2m.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-mdevice.c (renamed from drivers/media/video/s5p-fimc/fimc-mdevice.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-mdevice.h (renamed from drivers/media/video/s5p-fimc/fimc-mdevice.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-reg.c (renamed from drivers/media/video/s5p-fimc/fimc-reg.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-reg.h (renamed from drivers/media/video/s5p-fimc/fimc-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/mipi-csis.c (renamed from drivers/media/video/s5p-fimc/mipi-csis.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-fimc/mipi-csis.h (renamed from drivers/media/video/s5p-fimc/mipi-csis.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-g2d/Makefile (renamed from drivers/media/video/s5p-g2d/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-g2d/g2d-hw.c (renamed from drivers/media/video/s5p-g2d/g2d-hw.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-g2d/g2d-regs.h (renamed from drivers/media/video/s5p-g2d/g2d-regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-g2d/g2d.c (renamed from drivers/media/video/s5p-g2d/g2d.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-g2d/g2d.h (renamed from drivers/media/video/s5p-g2d/g2d.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-jpeg/Makefile (renamed from drivers/media/video/s5p-jpeg/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.c (renamed from drivers/media/video/s5p-jpeg/jpeg-core.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.h (renamed from drivers/media/video/s5p-jpeg/jpeg-core.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-hw.h (renamed from drivers/media/video/s5p-jpeg/jpeg-hw.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-regs.h (renamed from drivers/media/video/s5p-jpeg/jpeg-regs.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/Makefile (renamed from drivers/media/video/s5p-mfc/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/regs-mfc.h (renamed from drivers/media/video/s5p-mfc/regs-mfc.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_cmd.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_cmd.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_common.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_common.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_ctrl.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_debug.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_debug.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_dec.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_dec.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_dec.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_dec.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_enc.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_enc.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_enc.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_enc.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_intr.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_intr.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_intr.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_intr.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_opr.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_opr.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_opr.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_opr.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_pm.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_pm.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_pm.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_pm.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_shm.c (renamed from drivers/media/video/s5p-mfc/s5p_mfc_shm.c) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_shm.h (renamed from drivers/media/video/s5p-mfc/s5p_mfc_shm.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/Kconfig (renamed from drivers/media/video/s5p-tv/Kconfig) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/Makefile (renamed from drivers/media/video/s5p-tv/Makefile) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/hdmi_drv.c (renamed from drivers/media/video/s5p-tv/hdmi_drv.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/hdmiphy_drv.c (renamed from drivers/media/video/s5p-tv/hdmiphy_drv.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer.h (renamed from drivers/media/video/s5p-tv/mixer.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_drv.c (renamed from drivers/media/video/s5p-tv/mixer_drv.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_grp_layer.c (renamed from drivers/media/video/s5p-tv/mixer_grp_layer.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_reg.c (renamed from drivers/media/video/s5p-tv/mixer_reg.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_video.c (renamed from drivers/media/video/s5p-tv/mixer_video.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_vp_layer.c (renamed from drivers/media/video/s5p-tv/mixer_vp_layer.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/regs-hdmi.h (renamed from drivers/media/video/s5p-tv/regs-hdmi.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/regs-mixer.h (renamed from drivers/media/video/s5p-tv/regs-mixer.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/regs-sdo.h (renamed from drivers/media/video/s5p-tv/regs-sdo.h) | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/regs-vp.h (renamed from drivers/media/video/s5p-tv/regs-vp.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/sdo_drv.c (renamed from drivers/media/video/s5p-tv/sdo_drv.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/sii9234_drv.c (renamed from drivers/media/video/s5p-tv/sii9234_drv.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/sh_mobile_ceu_camera.c (renamed from drivers/media/video/sh_mobile_ceu_camera.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/sh_vou.c (renamed from drivers/media/video/sh_vou.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera.c (renamed from drivers/media/i2c/soc_camera/soc_camera.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera_platform.c (renamed from drivers/media/video/soc_camera_platform.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/soc_mediabus.c (renamed from drivers/media/video/soc_mediabus.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/timblogiw.c (renamed from drivers/media/video/timblogiw.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/via-camera.c (renamed from drivers/media/video/via-camera.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/via-camera.h (renamed from drivers/media/video/via-camera.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/vino.c (renamed from drivers/media/video/vino.c) | 0 | ||||
-rw-r--r-- | drivers/media/platform/vino.h (renamed from drivers/media/video/vino.h) | 0 | ||||
-rw-r--r-- | drivers/media/platform/vivi.c (renamed from drivers/media/video/vivi.c) | 0 |
168 files changed, 37 insertions, 37 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 26f3de5..dcaaf8e 100644 --- a/drivers/media/Kconfig +++ b/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/drivers/media/Makefile b/drivers/media/Makefile index e1be196..b0b0193 100644 --- a/drivers/media/Makefile +++ b/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/drivers/media/video/Kconfig b/drivers/media/platform/Kconfig index 28b25bf..e1959a8 100644 --- a/drivers/media/video/Kconfig +++ b/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/drivers/media/video/Makefile b/drivers/media/platform/Makefile index b3effdc..b3effdc 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/platform/Makefile diff --git a/drivers/media/video/arv.c b/drivers/media/platform/arv.c index e346d32d..e346d32d 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/platform/arv.c diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/platform/atmel-isi.c index 6274a91..6274a91 100644 --- a/drivers/media/video/atmel-isi.c +++ b/drivers/media/platform/atmel-isi.c diff --git a/drivers/media/video/blackfin/Kconfig b/drivers/media/platform/blackfin/Kconfig index ecd5323..ecd5323 100644 --- a/drivers/media/video/blackfin/Kconfig +++ b/drivers/media/platform/blackfin/Kconfig diff --git a/drivers/media/video/blackfin/Makefile b/drivers/media/platform/blackfin/Makefile index aa3a0a2..aa3a0a2 100644 --- a/drivers/media/video/blackfin/Makefile +++ b/drivers/media/platform/blackfin/Makefile diff --git a/drivers/media/video/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 1677623..1677623 100644 --- a/drivers/media/video/blackfin/bfin_capture.c +++ b/drivers/media/platform/blackfin/bfin_capture.c diff --git a/drivers/media/video/blackfin/ppi.c b/drivers/media/platform/blackfin/ppi.c index d295921..d295921 100644 --- a/drivers/media/video/blackfin/ppi.c +++ b/drivers/media/platform/blackfin/ppi.c diff --git a/drivers/media/video/coda.c b/drivers/media/platform/coda.c index 0d6e0a0..0d6e0a0 100644 --- a/drivers/media/video/coda.c +++ b/drivers/media/platform/coda.c diff --git a/drivers/media/video/coda.h b/drivers/media/platform/coda.h index 4cf4a04..3fbb315 100644 --- a/drivers/media/video/coda.h +++ b/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/drivers/media/video/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig index 52c5ca6..52c5ca6 100644 --- a/drivers/media/video/davinci/Kconfig +++ b/drivers/media/platform/davinci/Kconfig diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/platform/davinci/Makefile index 74ed92d..74ed92d 100644 --- a/drivers/media/video/davinci/Makefile +++ b/drivers/media/platform/davinci/Makefile diff --git a/drivers/media/video/davinci/ccdc_hw_device.h b/drivers/media/platform/davinci/ccdc_hw_device.h index 86b9b35..86b9b35 100644 --- a/drivers/media/video/davinci/ccdc_hw_device.h +++ b/drivers/media/platform/davinci/ccdc_hw_device.h diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/platform/davinci/dm355_ccdc.c index ce0e413..ce0e413 100644 --- a/drivers/media/video/davinci/dm355_ccdc.c +++ b/drivers/media/platform/davinci/dm355_ccdc.c diff --git a/drivers/media/video/davinci/dm355_ccdc_regs.h b/drivers/media/platform/davinci/dm355_ccdc_regs.h index d6d2ef0..d6d2ef0 100644 --- a/drivers/media/video/davinci/dm355_ccdc_regs.h +++ b/drivers/media/platform/davinci/dm355_ccdc_regs.h diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c index ee7942b..ee7942b 100644 --- a/drivers/media/video/davinci/dm644x_ccdc.c +++ b/drivers/media/platform/davinci/dm644x_ccdc.c diff --git a/drivers/media/video/davinci/dm644x_ccdc_regs.h b/drivers/media/platform/davinci/dm644x_ccdc_regs.h index 90370e4..90370e4 100644 --- a/drivers/media/video/davinci/dm644x_ccdc_regs.h +++ b/drivers/media/platform/davinci/dm644x_ccdc_regs.h diff --git a/drivers/media/video/davinci/isif.c b/drivers/media/platform/davinci/isif.c index b99d542..b99d542 100644 --- a/drivers/media/video/davinci/isif.c +++ b/drivers/media/platform/davinci/isif.c diff --git a/drivers/media/video/davinci/isif_regs.h b/drivers/media/platform/davinci/isif_regs.h index aa69a46..aa69a46 100644 --- a/drivers/media/video/davinci/isif_regs.h +++ b/drivers/media/platform/davinci/isif_regs.h diff --git a/drivers/media/video/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index c4a82a1..c4a82a1 100644 --- a/drivers/media/video/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c diff --git a/drivers/media/video/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 9a05c81..9a05c81 100644 --- a/drivers/media/video/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c diff --git a/drivers/media/video/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c index bba299d..bba299d 100644 --- a/drivers/media/video/davinci/vpbe_osd.c +++ b/drivers/media/platform/davinci/vpbe_osd.c diff --git a/drivers/media/video/davinci/vpbe_osd_regs.h b/drivers/media/platform/davinci/vpbe_osd_regs.h index 584520f..584520f 100644 --- a/drivers/media/video/davinci/vpbe_osd_regs.h +++ b/drivers/media/platform/davinci/vpbe_osd_regs.h diff --git a/drivers/media/video/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c index b21ecc8..b21ecc8 100644 --- a/drivers/media/video/davinci/vpbe_venc.c +++ b/drivers/media/platform/davinci/vpbe_venc.c diff --git a/drivers/media/video/davinci/vpbe_venc_regs.h b/drivers/media/platform/davinci/vpbe_venc_regs.h index 947cb15..947cb15 100644 --- a/drivers/media/video/davinci/vpbe_venc_regs.h +++ b/drivers/media/platform/davinci/vpbe_venc_regs.h diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index 843b138..843b138 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 9bd3caa..9bd3caa 100644 --- a/drivers/media/video/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/platform/davinci/vpif.h index c2ce4d9..c2ce4d9 100644 --- a/drivers/media/video/davinci/vpif.h +++ b/drivers/media/platform/davinci/vpif.h diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 1b625b0..1b625b0 100644 --- a/drivers/media/video/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h index 3511510..3511510 100644 --- a/drivers/media/video/davinci/vpif_capture.h +++ b/drivers/media/platform/davinci/vpif_capture.h diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index 4a24848..4a24848 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/platform/davinci/vpif_display.h index 8967ffb..8967ffb 100644 --- a/drivers/media/video/davinci/vpif_display.h +++ b/drivers/media/platform/davinci/vpif_display.h diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c index 146e4b0..146e4b0 100644 --- a/drivers/media/video/davinci/vpss.c +++ b/drivers/media/platform/davinci/vpss.c diff --git a/drivers/media/video/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 20f9810..20f9810 100644 --- a/drivers/media/video/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c diff --git a/drivers/media/video/indycam.c b/drivers/media/platform/indycam.c index 5482363..5482363 100644 --- a/drivers/media/video/indycam.c +++ b/drivers/media/platform/indycam.c diff --git a/drivers/media/video/indycam.h b/drivers/media/platform/indycam.h index 881f21c..881f21c 100644 --- a/drivers/media/video/indycam.h +++ b/drivers/media/platform/indycam.h diff --git a/drivers/media/video/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c index a38c152..a38c152 100644 --- a/drivers/media/video/m2m-deinterlace.c +++ b/drivers/media/platform/m2m-deinterlace.c diff --git a/drivers/media/video/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig index bf739e3..bf739e3 100644 --- a/drivers/media/video/marvell-ccic/Kconfig +++ b/drivers/media/platform/marvell-ccic/Kconfig diff --git a/drivers/media/video/marvell-ccic/Makefile b/drivers/media/platform/marvell-ccic/Makefile index 05a792c5..05a792c5 100644 --- a/drivers/media/video/marvell-ccic/Makefile +++ b/drivers/media/platform/marvell-ccic/Makefile diff --git a/drivers/media/video/marvell-ccic/cafe-driver.c b/drivers/media/platform/marvell-ccic/cafe-driver.c index d030f9b..d030f9b 100644 --- a/drivers/media/video/marvell-ccic/cafe-driver.c +++ b/drivers/media/platform/marvell-ccic/cafe-driver.c diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index ce2b7b4..ce2b7b4 100644 --- a/drivers/media/video/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c diff --git a/drivers/media/video/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h index bd6acba..bd6acba 100644 --- a/drivers/media/video/marvell-ccic/mcam-core.h +++ b/drivers/media/platform/marvell-ccic/mcam-core.h diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c index c4c17fe..c4c17fe 100644 --- a/drivers/media/video/marvell-ccic/mmp-driver.c +++ b/drivers/media/platform/marvell-ccic/mmp-driver.c diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c index 6d0d2fb..6d0d2fb 100644 --- a/drivers/media/video/mem2mem_testdev.c +++ b/drivers/media/platform/mem2mem_testdev.c diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/platform/mx1_camera.c index d2e6f82..d2e6f82 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/platform/mx1_camera.c diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/platform/mx2_camera.c index 637bde8..637bde8 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/platform/mx2_camera.c diff --git a/drivers/media/video/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c index 2810015..2810015 100644 --- a/drivers/media/video/mx2_emmaprp.c +++ b/drivers/media/platform/mx2_emmaprp.c diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/platform/mx3_camera.c index f13643d..f13643d 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/platform/mx3_camera.c diff --git a/drivers/media/video/omap/Kconfig b/drivers/media/platform/omap/Kconfig index 390ab09..390ab09 100644 --- a/drivers/media/video/omap/Kconfig +++ b/drivers/media/platform/omap/Kconfig diff --git a/drivers/media/video/omap/Makefile b/drivers/media/platform/omap/Makefile index fc410b4..fc410b4 100644 --- a/drivers/media/video/omap/Makefile +++ b/drivers/media/platform/omap/Makefile diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 88cf9d9..88cf9d9 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c diff --git a/drivers/media/video/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index 4be26abf6c..4be26abf6c 100644 --- a/drivers/media/video/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c diff --git a/drivers/media/video/omap/omap_vout_vrfb.h b/drivers/media/platform/omap/omap_vout_vrfb.h index ffde741..ffde741 100644 --- a/drivers/media/video/omap/omap_vout_vrfb.h +++ b/drivers/media/platform/omap/omap_vout_vrfb.h diff --git a/drivers/media/video/omap/omap_voutdef.h b/drivers/media/platform/omap/omap_voutdef.h index 27a95d2..27a95d2 100644 --- a/drivers/media/video/omap/omap_voutdef.h +++ b/drivers/media/platform/omap/omap_voutdef.h diff --git a/drivers/media/video/omap/omap_voutlib.c b/drivers/media/platform/omap/omap_voutlib.c index 115408b..115408b 100644 --- a/drivers/media/video/omap/omap_voutlib.c +++ b/drivers/media/platform/omap/omap_voutlib.c diff --git a/drivers/media/video/omap/omap_voutlib.h b/drivers/media/platform/omap/omap_voutlib.h index e51750a..e51750a 100644 --- a/drivers/media/video/omap/omap_voutlib.h +++ b/drivers/media/platform/omap/omap_voutlib.h diff --git a/drivers/media/video/omap1_camera.c b/drivers/media/platform/omap1_camera.c index c7e4114..fa08c76 100644 --- a/drivers/media/video/omap1_camera.c +++ b/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/drivers/media/video/omap24xxcam-dma.c b/drivers/media/platform/omap24xxcam-dma.c index b5ae170..9c00776 100644 --- a/drivers/media/video/omap24xxcam-dma.c +++ b/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/drivers/media/video/omap24xxcam.c b/drivers/media/platform/omap24xxcam.c index e5015b0..fde2e66 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/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/drivers/media/video/omap24xxcam.h b/drivers/media/platform/omap24xxcam.h index d59727a..c439595 100644 --- a/drivers/media/video/omap24xxcam.h +++ b/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/drivers/media/video/omap3isp/Makefile b/drivers/media/platform/omap3isp/Makefile index e8847e7..e8847e7 100644 --- a/drivers/media/video/omap3isp/Makefile +++ b/drivers/media/platform/omap3isp/Makefile diff --git a/drivers/media/video/omap3isp/cfa_coef_table.h b/drivers/media/platform/omap3isp/cfa_coef_table.h index c84df07..c84df07 100644 --- a/drivers/media/video/omap3isp/cfa_coef_table.h +++ b/drivers/media/platform/omap3isp/cfa_coef_table.h diff --git a/drivers/media/video/omap3isp/gamma_table.h b/drivers/media/platform/omap3isp/gamma_table.h index 78deebf..78deebf 100644 --- a/drivers/media/video/omap3isp/gamma_table.h +++ b/drivers/media/platform/omap3isp/gamma_table.h diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index e0096e0..e0096e0 100644 --- a/drivers/media/video/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c diff --git a/drivers/media/video/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h index 8be7487..8be7487 100644 --- a/drivers/media/video/omap3isp/isp.h +++ b/drivers/media/platform/omap3isp/isp.h diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c index aa9df9d..aa9df9d 100644 --- a/drivers/media/video/omap3isp/ispccdc.c +++ b/drivers/media/platform/omap3isp/ispccdc.c diff --git a/drivers/media/video/omap3isp/ispccdc.h b/drivers/media/platform/omap3isp/ispccdc.h index a5da9e1..a5da9e1 100644 --- a/drivers/media/video/omap3isp/ispccdc.h +++ b/drivers/media/platform/omap3isp/ispccdc.h diff --git a/drivers/media/video/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c index 85f0de8..85f0de8 100644 --- a/drivers/media/video/omap3isp/ispccp2.c +++ b/drivers/media/platform/omap3isp/ispccp2.c diff --git a/drivers/media/video/omap3isp/ispccp2.h b/drivers/media/platform/omap3isp/ispccp2.h index 76d65f4..76d65f4 100644 --- a/drivers/media/video/omap3isp/ispccp2.h +++ b/drivers/media/platform/omap3isp/ispccp2.h diff --git a/drivers/media/video/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c index 6a3ff79..6a3ff79 100644 --- a/drivers/media/video/omap3isp/ispcsi2.c +++ b/drivers/media/platform/omap3isp/ispcsi2.c diff --git a/drivers/media/video/omap3isp/ispcsi2.h b/drivers/media/platform/omap3isp/ispcsi2.h index c57729b..c57729b 100644 --- a/drivers/media/video/omap3isp/ispcsi2.h +++ b/drivers/media/platform/omap3isp/ispcsi2.h diff --git a/drivers/media/video/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c index 348f67e..348f67e 100644 --- a/drivers/media/video/omap3isp/ispcsiphy.c +++ b/drivers/media/platform/omap3isp/ispcsiphy.c diff --git a/drivers/media/video/omap3isp/ispcsiphy.h b/drivers/media/platform/omap3isp/ispcsiphy.h index e93a661..e93a661 100644 --- a/drivers/media/video/omap3isp/ispcsiphy.h +++ b/drivers/media/platform/omap3isp/ispcsiphy.h diff --git a/drivers/media/video/omap3isp/isph3a.h b/drivers/media/platform/omap3isp/isph3a.h index fb09fd4..fb09fd4 100644 --- a/drivers/media/video/omap3isp/isph3a.h +++ b/drivers/media/platform/omap3isp/isph3a.h diff --git a/drivers/media/video/omap3isp/isph3a_aewb.c b/drivers/media/platform/omap3isp/isph3a_aewb.c index 036e996..036e996 100644 --- a/drivers/media/video/omap3isp/isph3a_aewb.c +++ b/drivers/media/platform/omap3isp/isph3a_aewb.c diff --git a/drivers/media/video/omap3isp/isph3a_af.c b/drivers/media/platform/omap3isp/isph3a_af.c index 42ccce3..42ccce3 100644 --- a/drivers/media/video/omap3isp/isph3a_af.c +++ b/drivers/media/platform/omap3isp/isph3a_af.c diff --git a/drivers/media/video/omap3isp/isphist.c b/drivers/media/platform/omap3isp/isphist.c index d1a8dee..d1a8dee 100644 --- a/drivers/media/video/omap3isp/isphist.c +++ b/drivers/media/platform/omap3isp/isphist.c diff --git a/drivers/media/video/omap3isp/isphist.h b/drivers/media/platform/omap3isp/isphist.h index 0b2a38e..0b2a38e 100644 --- a/drivers/media/video/omap3isp/isphist.h +++ b/drivers/media/platform/omap3isp/isphist.h diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c index 1ae1c09..1ae1c09 100644 --- a/drivers/media/video/omap3isp/isppreview.c +++ b/drivers/media/platform/omap3isp/isppreview.c diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/platform/omap3isp/isppreview.h index f669234..f669234 100644 --- a/drivers/media/video/omap3isp/isppreview.h +++ b/drivers/media/platform/omap3isp/isppreview.h diff --git a/drivers/media/video/omap3isp/ispqueue.c b/drivers/media/platform/omap3isp/ispqueue.c index 15bf3ea..15bf3ea 100644 --- a/drivers/media/video/omap3isp/ispqueue.c +++ b/drivers/media/platform/omap3isp/ispqueue.c diff --git a/drivers/media/video/omap3isp/ispqueue.h b/drivers/media/platform/omap3isp/ispqueue.h index 908dfd7..908dfd7 100644 --- a/drivers/media/video/omap3isp/ispqueue.h +++ b/drivers/media/platform/omap3isp/ispqueue.h diff --git a/drivers/media/video/omap3isp/ispreg.h b/drivers/media/platform/omap3isp/ispreg.h index 084ea77..084ea77 100644 --- a/drivers/media/video/omap3isp/ispreg.h +++ b/drivers/media/platform/omap3isp/ispreg.h diff --git a/drivers/media/video/omap3isp/ispresizer.c b/drivers/media/platform/omap3isp/ispresizer.c index d11fb26..d11fb26 100644 --- a/drivers/media/video/omap3isp/ispresizer.c +++ b/drivers/media/platform/omap3isp/ispresizer.c diff --git a/drivers/media/video/omap3isp/ispresizer.h b/drivers/media/platform/omap3isp/ispresizer.h index 70c1c0e..70c1c0e 100644 --- a/drivers/media/video/omap3isp/ispresizer.h +++ b/drivers/media/platform/omap3isp/ispresizer.h diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c index b8640be..b8640be 100644 --- a/drivers/media/video/omap3isp/ispstat.c +++ b/drivers/media/platform/omap3isp/ispstat.c diff --git a/drivers/media/video/omap3isp/ispstat.h b/drivers/media/platform/omap3isp/ispstat.h index 9b7c865..9b7c865 100644 --- a/drivers/media/video/omap3isp/ispstat.h +++ b/drivers/media/platform/omap3isp/ispstat.h diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index 3a5085e..3a5085e 100644 --- a/drivers/media/video/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c diff --git a/drivers/media/video/omap3isp/ispvideo.h b/drivers/media/platform/omap3isp/ispvideo.h index 1ad470e..1ad470e 100644 --- a/drivers/media/video/omap3isp/ispvideo.h +++ b/drivers/media/platform/omap3isp/ispvideo.h diff --git a/drivers/media/video/omap3isp/luma_enhance_table.h b/drivers/media/platform/omap3isp/luma_enhance_table.h index 098b45e..098b45e 100644 --- a/drivers/media/video/omap3isp/luma_enhance_table.h +++ b/drivers/media/platform/omap3isp/luma_enhance_table.h diff --git a/drivers/media/video/omap3isp/noise_filter_table.h b/drivers/media/platform/omap3isp/noise_filter_table.h index d50451a..d50451a 100644 --- a/drivers/media/video/omap3isp/noise_filter_table.h +++ b/drivers/media/platform/omap3isp/noise_filter_table.h diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/platform/pxa_camera.c index 9c21e01..9c21e01 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c diff --git a/drivers/media/video/s5p-fimc/Kconfig b/drivers/media/platform/s5p-fimc/Kconfig index a564f7e..a564f7e 100644 --- a/drivers/media/video/s5p-fimc/Kconfig +++ b/drivers/media/platform/s5p-fimc/Kconfig diff --git a/drivers/media/video/s5p-fimc/Makefile b/drivers/media/platform/s5p-fimc/Makefile index 4648514..4648514 100644 --- a/drivers/media/video/s5p-fimc/Makefile +++ b/drivers/media/platform/s5p-fimc/Makefile diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/platform/s5p-fimc/fimc-capture.c index 8e413dd..8e413dd 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/platform/s5p-fimc/fimc-capture.c diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/platform/s5p-fimc/fimc-core.c index 1a44540..1a44540 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.c +++ b/drivers/media/platform/s5p-fimc/fimc-core.c diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/platform/s5p-fimc/fimc-core.h index 808ccc6..808ccc6 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.h +++ b/drivers/media/platform/s5p-fimc/fimc-core.h diff --git a/drivers/media/video/s5p-fimc/fimc-lite-reg.c b/drivers/media/platform/s5p-fimc/fimc-lite-reg.c index f996e94..f996e94 100644 --- a/drivers/media/video/s5p-fimc/fimc-lite-reg.c +++ b/drivers/media/platform/s5p-fimc/fimc-lite-reg.c diff --git a/drivers/media/video/s5p-fimc/fimc-lite-reg.h b/drivers/media/platform/s5p-fimc/fimc-lite-reg.h index adb9e9e..adb9e9e 100644 --- a/drivers/media/video/s5p-fimc/fimc-lite-reg.h +++ b/drivers/media/platform/s5p-fimc/fimc-lite-reg.h diff --git a/drivers/media/video/s5p-fimc/fimc-lite.c b/drivers/media/platform/s5p-fimc/fimc-lite.c index c5b57e8..c5b57e8 100644 --- a/drivers/media/video/s5p-fimc/fimc-lite.c +++ b/drivers/media/platform/s5p-fimc/fimc-lite.c diff --git a/drivers/media/video/s5p-fimc/fimc-lite.h b/drivers/media/platform/s5p-fimc/fimc-lite.h index 44424ee..44424ee 100644 --- a/drivers/media/video/s5p-fimc/fimc-lite.h +++ b/drivers/media/platform/s5p-fimc/fimc-lite.h diff --git a/drivers/media/video/s5p-fimc/fimc-m2m.c b/drivers/media/platform/s5p-fimc/fimc-m2m.c index c587011..c587011 100644 --- a/drivers/media/video/s5p-fimc/fimc-m2m.c +++ b/drivers/media/platform/s5p-fimc/fimc-m2m.c diff --git a/drivers/media/video/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c index e65bb28..e65bb28 100644 --- a/drivers/media/video/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c diff --git a/drivers/media/video/s5p-fimc/fimc-mdevice.h b/drivers/media/platform/s5p-fimc/fimc-mdevice.h index 1f5dbaf..1f5dbaf 100644 --- a/drivers/media/video/s5p-fimc/fimc-mdevice.h +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.h diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/platform/s5p-fimc/fimc-reg.c index 0e3eb9c..0e3eb9c 100644 --- a/drivers/media/video/s5p-fimc/fimc-reg.c +++ b/drivers/media/platform/s5p-fimc/fimc-reg.c diff --git a/drivers/media/video/s5p-fimc/fimc-reg.h b/drivers/media/platform/s5p-fimc/fimc-reg.h index 579ac8a..579ac8a 100644 --- a/drivers/media/video/s5p-fimc/fimc-reg.h +++ b/drivers/media/platform/s5p-fimc/fimc-reg.h diff --git a/drivers/media/video/s5p-fimc/mipi-csis.c b/drivers/media/platform/s5p-fimc/mipi-csis.c index 2f73d9e..2f73d9e 100644 --- a/drivers/media/video/s5p-fimc/mipi-csis.c +++ b/drivers/media/platform/s5p-fimc/mipi-csis.c diff --git a/drivers/media/video/s5p-fimc/mipi-csis.h b/drivers/media/platform/s5p-fimc/mipi-csis.h index 2709286..2709286 100644 --- a/drivers/media/video/s5p-fimc/mipi-csis.h +++ b/drivers/media/platform/s5p-fimc/mipi-csis.h diff --git a/drivers/media/video/s5p-g2d/Makefile b/drivers/media/platform/s5p-g2d/Makefile index 2c48c41..2c48c41 100644 --- a/drivers/media/video/s5p-g2d/Makefile +++ b/drivers/media/platform/s5p-g2d/Makefile diff --git a/drivers/media/video/s5p-g2d/g2d-hw.c b/drivers/media/platform/s5p-g2d/g2d-hw.c index 5b86cbe..5b86cbe 100644 --- a/drivers/media/video/s5p-g2d/g2d-hw.c +++ b/drivers/media/platform/s5p-g2d/g2d-hw.c diff --git a/drivers/media/video/s5p-g2d/g2d-regs.h b/drivers/media/platform/s5p-g2d/g2d-regs.h index 02e1cf5..02e1cf5 100644 --- a/drivers/media/video/s5p-g2d/g2d-regs.h +++ b/drivers/media/platform/s5p-g2d/g2d-regs.h diff --git a/drivers/media/video/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 0edc2df..0edc2df 100644 --- a/drivers/media/video/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c diff --git a/drivers/media/video/s5p-g2d/g2d.h b/drivers/media/platform/s5p-g2d/g2d.h index 6b765b0..6b765b0 100644 --- a/drivers/media/video/s5p-g2d/g2d.h +++ b/drivers/media/platform/s5p-g2d/g2d.h diff --git a/drivers/media/video/s5p-jpeg/Makefile b/drivers/media/platform/s5p-jpeg/Makefile index ddc2900..ddc2900 100644 --- a/drivers/media/video/s5p-jpeg/Makefile +++ b/drivers/media/platform/s5p-jpeg/Makefile diff --git a/drivers/media/video/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index be04d58..72c3e52 100644 --- a/drivers/media/video/s5p-jpeg/jpeg-core.c +++ b/drivers/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 b/drivers/media/platform/s5p-jpeg/jpeg-core.h index 9d0cd2b..022b9b9 100644 --- a/drivers/media/video/s5p-jpeg/jpeg-core.h +++ b/drivers/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/drivers/media/video/s5p-jpeg/jpeg-hw.h b/drivers/media/platform/s5p-jpeg/jpeg-hw.h index f12f0fd..b47e887 100644 --- a/drivers/media/video/s5p-jpeg/jpeg-hw.h +++ b/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 b/drivers/media/platform/s5p-jpeg/jpeg-regs.h index 91f4dd5..38e5081 100644 --- a/drivers/media/video/s5p-jpeg/jpeg-regs.h +++ b/drivers/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/drivers/media/video/s5p-mfc/Makefile b/drivers/media/platform/s5p-mfc/Makefile index d066340..d066340 100644 --- a/drivers/media/video/s5p-mfc/Makefile +++ b/drivers/media/platform/s5p-mfc/Makefile diff --git a/drivers/media/video/s5p-mfc/regs-mfc.h b/drivers/media/platform/s5p-mfc/regs-mfc.h index a19bece..a19bece 100644 --- a/drivers/media/video/s5p-mfc/regs-mfc.h +++ b/drivers/media/platform/s5p-mfc/regs-mfc.h diff --git a/drivers/media/video/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index e3e616d..e3e616d 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_cmd.c b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c index f0665ed..91a4155 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_cmd.c +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h index 5ceebfe..8b090d3 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_cmd.h +++ b/drivers/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/drivers/media/video/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index bd5706a..bd5706a 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 08a5cfe..4d662f1 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/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/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h index 61dc23b..e1e0c54 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.h +++ b/drivers/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/drivers/media/video/s5p-mfc/s5p_mfc_debug.h b/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h index ecb8616..bd5cd4a 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_debug.h +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index c5d567f..456f5df 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h index fb8b215..fdf1d99 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.h +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index aa1c244..fdeebb0 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h index 405bdd3..ca9fd66 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.h +++ b/drivers/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/drivers/media/video/s5p-mfc/s5p_mfc_intr.c b/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c index 8f2f8bf..37860e2 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_intr.c +++ b/drivers/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/drivers/media/video/s5p-mfc/s5p_mfc_intr.h b/drivers/media/platform/s5p-mfc/s5p_mfc_intr.h index 122d773..18341a8 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_intr.h +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c index e6217cb..b5fd3d4 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.c +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h index 5932d1c..2ad3def 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c index 738a607..0503d14 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h index 5107914..875c534 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_pm.h +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_shm.c index 91fdbac8..b5933d2 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_shm.c +++ b/drivers/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 b/drivers/media/platform/s5p-mfc/s5p_mfc_shm.h index cf962a4..416ebd7 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_shm.h +++ b/drivers/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/drivers/media/video/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig index f248b28..ea11a51 100644 --- a/drivers/media/video/s5p-tv/Kconfig +++ b/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/drivers/media/video/s5p-tv/Makefile b/drivers/media/platform/s5p-tv/Makefile index f49e756..7cd4790 100644 --- a/drivers/media/video/s5p-tv/Makefile +++ b/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/drivers/media/video/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c index 20cb6ee..20cb6ee 100644 --- a/drivers/media/video/s5p-tv/hdmi_drv.c +++ b/drivers/media/platform/s5p-tv/hdmi_drv.c diff --git a/drivers/media/video/s5p-tv/hdmiphy_drv.c b/drivers/media/platform/s5p-tv/hdmiphy_drv.c index f67b386..f67b386 100644 --- a/drivers/media/video/s5p-tv/hdmiphy_drv.c +++ b/drivers/media/platform/s5p-tv/hdmiphy_drv.c diff --git a/drivers/media/video/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h index ddb422e..ddb422e 100644 --- a/drivers/media/video/s5p-tv/mixer.h +++ b/drivers/media/platform/s5p-tv/mixer.h diff --git a/drivers/media/video/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c index edca065..edca065 100644 --- a/drivers/media/video/s5p-tv/mixer_drv.c +++ b/drivers/media/platform/s5p-tv/mixer_drv.c diff --git a/drivers/media/video/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c index b93a21f..b93a21f 100644 --- a/drivers/media/video/s5p-tv/mixer_grp_layer.c +++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c diff --git a/drivers/media/video/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c index 3b1670a..3b1670a 100644 --- a/drivers/media/video/s5p-tv/mixer_reg.c +++ b/drivers/media/platform/s5p-tv/mixer_reg.c diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index e0e02cc..e0e02cc 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c diff --git a/drivers/media/video/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c index 3d13a63..3d13a63 100644 --- a/drivers/media/video/s5p-tv/mixer_vp_layer.c +++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c diff --git a/drivers/media/video/s5p-tv/regs-hdmi.h b/drivers/media/platform/s5p-tv/regs-hdmi.h index a889d1f..a889d1f 100644 --- a/drivers/media/video/s5p-tv/regs-hdmi.h +++ b/drivers/media/platform/s5p-tv/regs-hdmi.h diff --git a/drivers/media/video/s5p-tv/regs-mixer.h b/drivers/media/platform/s5p-tv/regs-mixer.h index 158abb4..158abb4 100644 --- a/drivers/media/video/s5p-tv/regs-mixer.h +++ b/drivers/media/platform/s5p-tv/regs-mixer.h diff --git a/drivers/media/video/s5p-tv/regs-sdo.h b/drivers/media/platform/s5p-tv/regs-sdo.h index 7f7c2b8a..6f22fbf 100644 --- a/drivers/media/video/s5p-tv/regs-sdo.h +++ b/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/drivers/media/video/s5p-tv/regs-vp.h b/drivers/media/platform/s5p-tv/regs-vp.h index 6c63984..6c63984 100644 --- a/drivers/media/video/s5p-tv/regs-vp.h +++ b/drivers/media/platform/s5p-tv/regs-vp.h diff --git a/drivers/media/video/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c index f6bca2c..f6bca2c 100644 --- a/drivers/media/video/s5p-tv/sdo_drv.c +++ b/drivers/media/platform/s5p-tv/sdo_drv.c diff --git a/drivers/media/video/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c index 6d348f9..6d348f9 100644 --- a/drivers/media/video/s5p-tv/sii9234_drv.c +++ b/drivers/media/platform/s5p-tv/sii9234_drv.c diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/platform/sh_mobile_ceu_camera.c index 0baaf94..0baaf94 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/platform/sh_mobile_ceu_camera.c diff --git a/drivers/media/video/sh_vou.c b/drivers/media/platform/sh_vou.c index 9f62fd8..9f62fd8 100644 --- a/drivers/media/video/sh_vou.c +++ b/drivers/media/platform/sh_vou.c diff --git a/drivers/media/i2c/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera.c index 9758217..9758217 100644 --- a/drivers/media/i2c/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera.c diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/platform/soc_camera_platform.c index f59ccad..f59ccad 100644 --- a/drivers/media/video/soc_camera_platform.c +++ b/drivers/media/platform/soc_camera_platform.c diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/platform/soc_mediabus.c index 89dce09..89dce09 100644 --- a/drivers/media/video/soc_mediabus.c +++ b/drivers/media/platform/soc_mediabus.c diff --git a/drivers/media/video/timblogiw.c b/drivers/media/platform/timblogiw.c index 02194c0..02194c0 100644 --- a/drivers/media/video/timblogiw.c +++ b/drivers/media/platform/timblogiw.c diff --git a/drivers/media/video/via-camera.c b/drivers/media/platform/via-camera.c index eb404c2..eb404c2 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/platform/via-camera.c diff --git a/drivers/media/video/via-camera.h b/drivers/media/platform/via-camera.h index b12a4b3..b12a4b3 100644 --- a/drivers/media/video/via-camera.h +++ b/drivers/media/platform/via-camera.h diff --git a/drivers/media/video/vino.c b/drivers/media/platform/vino.c index aae1720..aae1720 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/platform/vino.c diff --git a/drivers/media/video/vino.h b/drivers/media/platform/vino.h index de2d615..de2d615 100644 --- a/drivers/media/video/vino.h +++ b/drivers/media/platform/vino.h diff --git a/drivers/media/video/vivi.c b/drivers/media/platform/vivi.c index a6351c4..a6351c4 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/platform/vivi.c |