AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 08:50:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] include/media: move driver interface headers to a separate dir

Browse Source 
Let's not mix headers used by the core with those headers that
are needed by some driver-specific interface header.

The headers used on drivers were manually moved using:
    mkdir include/media/drv-intf/
    git mv include/media/cx2341x.h include/media/cx25840.h \
	include/media/exynos-fimc.h include/media/msp3400.h \
	include/media/s3c_camif.h include/media/saa7146.h \
	include/media/saa7146_vv.h  include/media/sh_mobile_ceu.h \
	include/media/sh_mobile_csi2.h include/media/sh_vou.h \
	include/media/si476x.h include/media/soc_mediabus.h \
	include/media/tea575x.h include/media/drv-intf/

And the references for those headers were corrected using:

    MAIN_DIR="media/"
    PREV_DIR="media/"
    DIRS="drv-intf/"

    echo "Checking affected files" >&2
    for i in $DIRS; do
	for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do
		 n=`basename $j`
		git grep -l $n
	done
    done|sort|uniq >files && (
	echo "Handling files..." >&2;
	echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\";
	(
		cd include/$MAIN_DIR;
		for j in $DIRS; do
			for i in $(ls $j); do
				echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\";
			done;
		done;
		echo "cat > a && mv a \$i; done";
	);
	echo "Handling documentation..." >&2;
	echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\";
	(
		cd include/$MAIN_DIR;
		for j in $DIRS; do
			for i in $(ls $j); do
				echo "  perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\";
			done;
		done;
		echo "cat > a && mv a \$i; done"
	);
    ) >script && . ./script

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Mauro Carvalho Chehab 2015-11-13 19:40:07 -02:00
parent b5dcee225c
commit d647f0b70c
98 changed files with 98 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -9225,7 +9225,7 @@ L: linux-media@vger.kernel.org
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
S: Maintained
F: drivers/media/platform/s3c-camif/
F: include/media/s3c_camif.h
F: include/media/drv-intf/s3c_camif.h
SAMSUNG S5C73M3 CAMERA DRIVER
M: Kyungmin Park <kyungmin.park@samsung.com>
@ -9686,7 +9686,7 @@ SH_VOU V4L2 OUTPUT DRIVER
L: linux-media@vger.kernel.org
S: Orphan
F: drivers/media/platform/sh_vou.c
F: include/media/sh_vou.h
F: include/media/drv-intf/sh_vou.h
SIMPLE FIRMWARE INTERFACE (SFI)
M: Len Brown <lenb@kernel.org>

2
arch/sh/boards/mach-ap325rxa/setup.c
View File

@ -30,7 +30,7 @@
#include <media/i2c/ov772x.h>
#include <media/soc_camera.h>
#include <media/soc_camera_platform.h>
#include <media/sh_mobile_ceu.h>
#include <media/drv-intf/sh_mobile_ceu.h>
#include <video/sh_mobile_lcdc.h>
#include <asm/io.h>
#include <asm/clock.h>

4
arch/sh/boards/mach-ecovec24/setup.c
View File

@ -38,7 +38,7 @@
#include <video/sh_mobile_lcdc.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include <media/sh_mobile_ceu.h>
#include <media/drv-intf/sh_mobile_ceu.h>
#include <media/soc_camera.h>
#include <media/i2c/tw9910.h>
#include <media/i2c/mt9t112.h>
@ -901,7 +901,7 @@ static struct platform_device irda_device = {
};
#include <media/i2c/ak881x.h>
#include <media/sh_vou.h>
#include <media/drv-intf/sh_vou.h>
static struct ak881x_pdata ak881x_pdata = {
.flags = AK881X_IF_MODE_SLAVE,

2
arch/sh/boards/mach-kfr2r09/setup.c
View File

@ -29,7 +29,7 @@
#include <linux/sh_intc.h>
#include <media/i2c/rj54n1cb0c.h>
#include <media/soc_camera.h>
#include <media/sh_mobile_ceu.h>
#include <media/drv-intf/sh_mobile_ceu.h>
#include <video/sh_mobile_lcdc.h>
#include <asm/suspend.h>
#include <asm/clock.h>

2
arch/sh/boards/mach-migor/setup.c
View File

@ -27,7 +27,7 @@
#include <linux/videodev2.h>
#include <linux/sh_intc.h>
#include <video/sh_mobile_lcdc.h>
#include <media/sh_mobile_ceu.h>
#include <media/drv-intf/sh_mobile_ceu.h>
#include <media/i2c/ov772x.h>
#include <media/soc_camera.h>
#include <media/i2c/tw9910.h>

4
arch/sh/boards/mach-se/7724/setup.c
View File

@ -30,7 +30,7 @@
#include <linux/sh_intc.h>
#include <linux/videodev2.h>
#include <video/sh_mobile_lcdc.h>
#include <media/sh_mobile_ceu.h>
#include <media/drv-intf/sh_mobile_ceu.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include <asm/io.h>
@ -535,7 +535,7 @@ static struct platform_device irda_device = {
};
#include <media/i2c/ak881x.h>
#include <media/sh_vou.h>
#include <media/drv-intf/sh_vou.h>
static struct ak881x_pdata ak881x_pdata = {
.flags = AK881X_IF_MODE_SLAVE,

2
drivers/media/common/cx2341x.c
View File

@ -27,7 +27,7 @@
#include <linux/videodev2.h>
#include <media/tuner.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include <media/v4l2-common.h>
MODULE_DESCRIPTION("cx23415/6/8 driver");

2
drivers/media/common/saa7146/saa7146_core.c
View File

@ -20,7 +20,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <media/saa7146.h>
#include <media/drv-intf/saa7146.h>
#include <linux/module.h>
static int saa7146_num;

2
drivers/media/common/saa7146/saa7146_fops.c
View File

@ -1,6 +1,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
#include <linux/module.h>
/****************************************************************************/

2
drivers/media/common/saa7146/saa7146_hlp.c
View File

@ -2,7 +2,7 @@
#include <linux/kernel.h>
#include <linux/export.h>
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
{

2
drivers/media/common/saa7146/saa7146_i2c.c
View File

@ -1,6 +1,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
{

2
drivers/media/common/saa7146/saa7146_vbi.c
View File

@ -1,4 +1,4 @@
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
static int vbi_pixel_to_capture = 720 * 2;

2
drivers/media/common/saa7146/saa7146_video.c
View File

@ -1,6 +1,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
#include <media/v4l2-event.h>
#include <media/v4l2-ctrls.h>
#include <linux/module.h>

2
drivers/media/i2c/cx25840/cx25840-audio.c
View File

@ -19,7 +19,7 @@
#include <linux/videodev2.h>
#include <linux/i2c.h>
#include <media/v4l2-common.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include "cx25840-core.h"

2
drivers/media/i2c/cx25840/cx25840-core.c
View File

@ -45,7 +45,7 @@
#include <linux/delay.h>
#include <linux/math64.h>
#include <media/v4l2-common.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include "cx25840-core.h"

2
drivers/media/i2c/cx25840/cx25840-firmware.c
View File

@ -19,7 +19,7 @@
#include <linux/i2c.h>
#include <linux/firmware.h>
#include <media/v4l2-common.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include "cx25840-core.h"

2
drivers/media/i2c/cx25840/cx25840-ir.c
View File

@ -24,7 +24,7 @@
#include <linux/slab.h>
#include <linux/kfifo.h>
#include <linux/module.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include <media/rc-core.h>
#include "cx25840-core.h"

2
drivers/media/i2c/cx25840/cx25840-vbi.c
View File

@ -19,7 +19,7 @@
#include <linux/videodev2.h>
#include <linux/i2c.h>
#include <media/v4l2-common.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include "cx25840-core.h"

2
drivers/media/i2c/m5mols/m5mols_capture.c
View File

@ -26,7 +26,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-subdev.h>
#include <media/i2c/m5mols.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "m5mols.h"
#include "m5mols_reg.h"

2
drivers/media/i2c/msp3400-driver.c
View File

@ -56,7 +56,7 @@
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/i2c/tvaudio.h>
#include "msp3400-driver.h"

2
drivers/media/i2c/msp3400-driver.h
View File

@ -4,7 +4,7 @@
#ifndef MSP3400_DRIVER_H
#define MSP3400_DRIVER_H
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>

2
drivers/media/i2c/msp3400-kthreads.c
View File

@ -26,7 +26,7 @@
#include <linux/freezer.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <linux/kthread.h>
#include <linux/suspend.h>
#include "msp3400-driver.h"

2
drivers/media/i2c/soc_camera/mt9m001.c
View File

@ -15,7 +15,7 @@
#include <linux/module.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/v4l2-clk.h>
#include <media/v4l2-subdev.h>
#include <media/v4l2-ctrls.h>

2
drivers/media/i2c/soc_camera/mt9v022.c
View File

@ -17,7 +17,7 @@
#include <media/i2c/mt9v022.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/v4l2-subdev.h>
#include <media/v4l2-clk.h>
#include <media/v4l2-ctrls.h>

2
drivers/media/pci/bt8xx/bttv-driver.c
View File

@ -51,7 +51,7 @@
#include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#include <media/i2c/tvaudio.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <linux/dma-mapping.h>

2
drivers/media/pci/bt8xx/bttvp.h
View File

@ -42,7 +42,7 @@
#include <media/tveeprom.h>
#include <media/rc-core.h>
#include <media/i2c/ir-kbd-i2c.h>
#include <media/tea575x.h>
#include <media/drv-intf/tea575x.h>
#include "bt848.h"
#include "bttv.h"

2
drivers/media/pci/cx18/cx23418.h
View File

@ -22,7 +22,7 @@
#ifndef CX23418_H
#define CX23418_H
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#define MGR_CMD_MASK 0x40000000
/* The MSB of the command code indicates that this is the completion of a

2
drivers/media/pci/cx23885/cx23885-417.c
View File

@ -30,7 +30,7 @@
#include <linux/slab.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include "cx23885.h"
#include "cx23885-ioctl.h"

2
drivers/media/pci/cx23885/cx23885-cards.c
View File

@ -19,7 +19,7 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/delay.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include <linux/firmware.h>
#include <misc/altera.h>

2
drivers/media/pci/cx23885/cx23885-video.c
View File

@ -35,7 +35,7 @@
#include "cx23885-ioctl.h"
#include "tuner-xc2028.h"
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards");
MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");

2
drivers/media/pci/cx23885/cx23885.h
View File

@ -30,7 +30,7 @@
#include <media/rc-core.h>
#include "cx23885-reg.h"
#include "media/cx2341x.h"
#include "media/drv-intf/cx2341x.h"
#include <linux/mutex.h>

2
drivers/media/pci/cx88/cx88-blackbird.c
View File

@ -36,7 +36,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include "cx88.h"

2
drivers/media/pci/cx88/cx88.h
View File

@ -30,7 +30,7 @@
#include <media/tuner.h>
#include <media/tveeprom.h>
#include <media/videobuf2-dma-sg.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include <media/videobuf2-dvb.h>
#include <media/i2c/ir-kbd-i2c.h>
#include <media/i2c/wm8775.h>

4
drivers/media/pci/ivtv/ivtv-cards.c
View File

@ -22,11 +22,11 @@
#include "ivtv-cards.h"
#include "ivtv-i2c.h"
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/i2c/m52790.h>
#include <media/i2c/wm8775.h>
#include <media/i2c/cs53l32a.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include <media/i2c/upd64031a.h>
#define MSP_TUNER MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, \

2
drivers/media/pci/ivtv/ivtv-driver.h
View File

@ -64,7 +64,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-fh.h>
#include <media/tuner.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include <media/i2c/ir-kbd-i2c.h>
#include <linux/ivtv.h>

2
drivers/media/pci/ivtv/ivtv-i2c.c
View File

@ -63,7 +63,7 @@
#include "ivtv-cards.h"
#include "ivtv-gpio.h"
#include "ivtv-i2c.h"
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
/* i2c implementation for cx23415/6 chip, ivtv project.
* Author: Kevin Thayer (nufan_wfk at yahoo.com)

2
drivers/media/pci/ivtv/ivtv-routing.c
View File

@ -24,7 +24,7 @@
#include "ivtv-gpio.h"
#include "ivtv-routing.h"
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/i2c/m52790.h>
#include <media/i2c/upd64031a.h>
#include <media/i2c/upd64083.h>

2
drivers/media/pci/saa7146/hexium_gemini.c
View File

@ -25,7 +25,7 @@
#define DEBUG_VARIABLE debug
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
#include <linux/module.h>
static int debug;

2
drivers/media/pci/saa7146/hexium_orion.c
View File

@ -25,7 +25,7 @@
#define DEBUG_VARIABLE debug
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
#include <linux/module.h>
static int debug;

2
drivers/media/pci/saa7146/mxb.c
View File

@ -25,7 +25,7 @@
#define DEBUG_VARIABLE debug
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
#include <media/tuner.h>
#include <media/v4l2-common.h>
#include <media/i2c/saa7115.h>

2
drivers/media/pci/ttpci/av7110.h
View File

@ -32,7 +32,7 @@
#include "stv0297.h"
#include "l64781.h"
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
#define ANALOG_TUNER_VES1820 1

2
drivers/media/pci/ttpci/budget-av.c
View File

@ -46,7 +46,7 @@
#include "tda1004x.h"
#include "tua6100.h"
#include "dvb-pll.h"
#include <media/saa7146_vv.h>
#include <media/drv-intf/saa7146_vv.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/slab.h>

2
drivers/media/pci/ttpci/budget.h
View File

@ -13,7 +13,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <media/saa7146.h>
#include <media/drv-intf/saa7146.h>
extern int budget_debug;

2
drivers/media/platform/exynos4-is/common.c
View File

@ -10,7 +10,7 @@
*/
#include <linux/module.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "common.h"
/* Called with the media graph mutex held or entity->stream_count > 0. */

2
drivers/media/platform/exynos4-is/fimc-core.h
View File

@ -27,7 +27,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-mem2mem.h>
#include <media/v4l2-mediabus.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#define dbg(fmt, args...) \
pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)

2
drivers/media/platform/exynos4-is/fimc-isp-video.c
View File

@ -30,7 +30,7 @@
#include <media/v4l2-ioctl.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-contig.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "common.h"
#include "media-dev.h"

2
drivers/media/platform/exynos4-is/fimc-isp.h
View File

@ -24,7 +24,7 @@
#include <media/videobuf2-v4l2.h>
#include <media/v4l2-device.h>
#include <media/v4l2-mediabus.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
extern int fimc_isp_debug;

2
drivers/media/platform/exynos4-is/fimc-lite-reg.c
View File

@ -12,7 +12,7 @@
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "fimc-lite-reg.h"
#include "fimc-lite.h"

2
drivers/media/platform/exynos4-is/fimc-lite.c
View File

@ -30,7 +30,7 @@
#include <media/v4l2-mem2mem.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-contig.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "common.h"
#include "fimc-core.h"

2
drivers/media/platform/exynos4-is/fimc-lite.h
View File

@ -23,7 +23,7 @@
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-mediabus.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#define FIMC_LITE_DRV_NAME "exynos-fimc-lite"
#define FLITE_CLK_NAME "flite"

2
drivers/media/platform/exynos4-is/fimc-reg.c
View File

@ -13,7 +13,7 @@
#include <linux/io.h>
#include <linux/regmap.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "media-dev.h"
#include "fimc-reg.h"

2
drivers/media/platform/exynos4-is/media-dev.c
View File

@ -31,7 +31,7 @@
#include <media/v4l2-ctrls.h>
#include <media/v4l2-of.h>
#include <media/media-device.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "media-dev.h"
#include "fimc-core.h"

2
drivers/media/platform/exynos4-is/media-dev.h
View File

@ -19,7 +19,7 @@
#include <media/media-entity.h>
#include <media/v4l2-device.h>
#include <media/v4l2-subdev.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include "fimc-core.h"
#include "fimc-lite.h"

2
drivers/media/platform/exynos4-is/mipi-csis.c
View File

@ -29,7 +29,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/videodev2.h>
#include <media/exynos-fimc.h>
#include <media/drv-intf/exynos-fimc.h>
#include <media/v4l2-of.h>
#include <media/v4l2-subdev.h>

2
drivers/media/platform/s3c-camif/camif-core.h
View File

@ -26,7 +26,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-mediabus.h>
#include <media/videobuf2-v4l2.h>
#include <media/s3c_camif.h>
#include <media/drv-intf/s3c_camif.h>
#define S3C_CAMIF_DRIVER_NAME "s3c-camif"
#define CAMIF_REQ_BUFS_MIN 3

2
drivers/media/platform/s3c-camif/camif-regs.h
View File

@ -13,7 +13,7 @@
#define CAMIF_REGS_H_
#include "camif-core.h"
#include <media/s3c_camif.h>
#include <media/drv-intf/s3c_camif.h>
/*
* The id argument indicates the processing path:

2
drivers/media/platform/sh_vou.c
View File

@ -22,7 +22,7 @@
#include <linux/videodev2.h>
#include <linux/module.h>
#include <media/sh_vou.h>
#include <media/drv-intf/sh_vou.h>
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>

2
drivers/media/platform/soc_camera/atmel-isi.c
View File

@ -24,7 +24,7 @@
#include <linux/slab.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/v4l2-of.h>
#include <media/videobuf2-dma-contig.h>

2
drivers/media/platform/soc_camera/mx2_camera.c
View File

@ -35,7 +35,7 @@
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-contig.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <linux/videodev2.h>

2
drivers/media/platform/soc_camera/mx3_camera.c
View File

@ -23,7 +23,7 @@
#include <media/v4l2-dev.h>
#include <media/videobuf2-dma-contig.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <linux/platform_data/camera-mx3.h>
#include <linux/platform_data/dma-imx.h>

2
drivers/media/platform/soc_camera/omap1_camera.c
View File

@ -30,7 +30,7 @@
#include <media/omap1_camera.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/videobuf-dma-contig.h>
#include <media/videobuf-dma-sg.h>

2
drivers/media/platform/soc_camera/pxa_camera.c
View File

@ -33,7 +33,7 @@
#include <media/v4l2-dev.h>
#include <media/videobuf-dma-sg.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/v4l2-of.h>
#include <linux/videodev2.h>

2
drivers/media/platform/soc_camera/rcar_vin.c
View File

@ -28,7 +28,7 @@
#include <linux/videodev2.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/v4l2-common.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-device.h>

6
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
View File

@ -40,11 +40,11 @@
#include <media/v4l2-common.h>
#include <media/v4l2-dev.h>
#include <media/soc_camera.h>
#include <media/sh_mobile_ceu.h>
#include <media/sh_mobile_csi2.h>
#include <media/drv-intf/sh_mobile_ceu.h>
#include <media/drv-intf/sh_mobile_csi2.h>
#include <media/videobuf2-dma-contig.h>
#include <media/v4l2-mediabus.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include "soc_scale_crop.h"

6
drivers/media/platform/soc_camera/sh_mobile_csi2.c
View File

@ -18,10 +18,10 @@
#include <linux/videodev2.h>
#include <linux/module.h>
#include <media/sh_mobile_ceu.h>
#include <media/sh_mobile_csi2.h>
#include <media/drv-intf/sh_mobile_ceu.h>
#include <media/drv-intf/sh_mobile_csi2.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/v4l2-common.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-device.h>

2
drivers/media/platform/soc_camera/soc_camera.c
View File

@ -30,7 +30,7 @@
#include <linux/vmalloc.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
#include <media/v4l2-async.h>
#include <media/v4l2-clk.h>
#include <media/v4l2-common.h>

2
drivers/media/platform/soc_camera/soc_mediabus.c
View File

@ -13,7 +13,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-mediabus.h>
#include <media/soc_mediabus.h>
#include <media/drv-intf/soc_mediabus.h>
static const struct soc_mbus_lookup mbus_fmt[] = {
{

2
drivers/media/radio/radio-maxiradio.c
View File

@ -42,7 +42,7 @@
#include <linux/videodev2.h>
#include <linux/io.h>
#include <linux/slab.h>
#include <media/tea575x.h>
#include <media/drv-intf/tea575x.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-fh.h>

2
drivers/media/radio/radio-sf16fmr2.c
View File

@ -14,7 +14,7 @@
#include <linux/io.h> /* outb, outb_p */
#include <linux/isa.h>
#include <linux/pnp.h>
#include <media/tea575x.h>
#include <media/drv-intf/tea575x.h>
MODULE_AUTHOR("Ondrej Zary");
MODULE_DESCRIPTION("MediaForte SF16-FMR2 and SF16-FMD2 FM radio card driver");

2
drivers/media/radio/radio-shark.c
View File

@ -33,7 +33,7 @@
#include <linux/usb.h>
#include <linux/workqueue.h>
#include <media/v4l2-device.h>
#include <media/tea575x.h>
#include <media/drv-intf/tea575x.h>
#if defined(CONFIG_LEDS_CLASS) || \
(defined(CONFIG_LEDS_CLASS_MODULE) && defined(CONFIG_RADIO_SHARK_MODULE))

2
drivers/media/radio/radio-si476x.c
View File

@ -31,7 +31,7 @@
#include <media/v4l2-event.h>
#include <media/v4l2-device.h>
#include <media/si476x.h>
#include <media/drv-intf/si476x.h>
#include <linux/mfd/si476x-core.h>
#define FM_FREQ_RANGE_LOW 64000000

2
drivers/media/radio/tea575x.c
View File

@ -31,7 +31,7 @@
#include <media/v4l2-fh.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#include <media/tea575x.h>
#include <media/drv-intf/tea575x.h>
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");

2
drivers/media/usb/cx231xx/cx231xx-417.c
View File

@ -37,7 +37,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include <media/tuner.h>
#define CX231xx_FIRM_IMAGE_SIZE 376836

2
drivers/media/usb/cx231xx/cx231xx-cards.c
View File

@ -30,7 +30,7 @@
#include <media/tveeprom.h>
#include <media/v4l2-common.h>
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include "dvb-usb-ids.h"
#include "xc5000.h"
#include "tda18271.h"

2
drivers/media/usb/cx231xx/cx231xx-vbi.c
View File

@ -32,7 +32,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/tuner.h>
#include "cx231xx-vbi.h"

2
drivers/media/usb/cx231xx/cx231xx-video.c
View File

@ -36,7 +36,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/tuner.h>
#include "dvb_frontend.h"

2
drivers/media/usb/cx231xx/cx231xx.h
View File

@ -30,7 +30,7 @@
#include <linux/mutex.h>
#include <linux/usb.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include <media/videobuf-vmalloc.h>
#include <media/v4l2-device.h>

2
drivers/media/usb/em28xx/em28xx-cards.c
View File

@ -30,7 +30,7 @@
#include <linux/i2c.h>
#include <linux/usb.h>
#include <media/tuner.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/i2c/saa7115.h>
#include <media/i2c/tvp5150.h>
#include <media/i2c/tvaudio.h>

2
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -43,7 +43,7 @@
#include <media/v4l2-ioctl.h>
#include <media/v4l2-event.h>
#include <media/v4l2-clk.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/tuner.h>
#define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \

2
drivers/media/usb/pvrusb2/pvrusb2-audio.c
View File

@ -23,7 +23,7 @@
#include "pvrusb2-hdw-internal.h"
#include "pvrusb2-debug.h"
#include <linux/videodev2.h>
#include <media/msp3400.h>
#include <media/drv-intf/msp3400.h>
#include <media/v4l2-common.h>

2
drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c
View File

@ -32,7 +32,7 @@
#include "pvrusb2-hdw-internal.h"
#include "pvrusb2-debug.h"
#include <media/cx25840.h>
#include <media/drv-intf/cx25840.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <linux/errno.h>

2
drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h
View File

@ -39,7 +39,7 @@
#include "pvrusb2-hdw.h"
#include "pvrusb2-io.h"
#include <media/v4l2-device.h>
#include <media/cx2341x.h>
#include <media/drv-intf/cx2341x.h>
#include <media/i2c/ir-kbd-i2c.h>
#include "pvrusb2-devattr.h"

0
include/media/cx2341x.h → include/media/drv-intf/cx2341x.h
View File

0
include/media/cx25840.h → include/media/drv-intf/cx25840.h
View File

0
include/media/exynos-fimc.h → include/media/drv-intf/exynos-fimc.h
View File

1
include/media/msp3400.h → include/media/drv-intf/msp3400.h
View File

@ -223,4 +223,3 @@
*/
#endif /* MSP3400_H */

0
include/media/s3c_camif.h → include/media/drv-intf/s3c_camif.h
View File

0
include/media/saa7146.h → include/media/drv-intf/saa7146.h
View File

2
include/media/saa7146_vv.h → include/media/drv-intf/saa7146_vv.h
View File

@ -4,7 +4,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-fh.h>
#include <media/saa7146.h>
#include <media/drv-intf/saa7146.h>
#include <media/videobuf-dma-sg.h>
#define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */

0
include/media/sh_mobile_ceu.h → include/media/drv-intf/sh_mobile_ceu.h
View File

0
include/media/sh_mobile_csi2.h → include/media/drv-intf/sh_mobile_csi2.h
View File

0
include/media/sh_vou.h → include/media/drv-intf/sh_vou.h
View File

2
include/media/si476x.h → include/media/drv-intf/si476x.h
View File

@ -1,5 +1,5 @@
/*
* include/media/si476x.h -- Common definitions for si476x driver
* include/media/drv-intf/si476x.h -- Common definitions for si476x driver
*
* Copyright (C) 2012 Innovative Converged Devices(ICD)
* Copyright (C) 2013 Andrey Smirnov

0
include/media/soc_mediabus.h → include/media/drv-intf/soc_mediabus.h
View File

0
include/media/tea575x.h → include/media/drv-intf/tea575x.h
View File

6
include/uapi/linux/v4l2-controls.h
View File

@ -158,8 +158,10 @@ enum v4l2_colorfx {
* We reserve 16 controls for this driver. */
#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030)
/* The base for the si476x driver controls. See include/media/si476x.h for the list
* of controls. Total of 16 controls is reserved for this driver */
/*
* The base for the si476x driver controls. See include/media/drv-intf/si476x.h
* for the list of controls. Total of 16 controls is reserved for this driver
*/
#define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040)
/* The base for the TI VPE driver controls. Total of 16 controls is reserved for

2
sound/pci/es1968.c
View File

@ -113,7 +113,7 @@
#include <sound/initval.h>
#ifdef CONFIG_SND_ES1968_RADIO
#include <media/tea575x.h>
#include <media/drv-intf/tea575x.h>
#endif
#define CARD_NAME "ESS Maestro1/2"

2
sound/pci/fm801.c
View File

@ -30,7 +30,7 @@
#include <sound/initval.h>
#ifdef CONFIG_SND_FM801_TEA575X_BOOL
#include <media/tea575x.h>
#include <media/drv-intf/tea575x.h>
#endif
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");