tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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>

Mauro Carvalho Chehab d647f0b7 b5dcee22

+98 -97
+2 -2
MAINTAINERS
··· 9225 9225 L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) 9226 9226 S: Maintained 9227 9227 F: drivers/media/platform/s3c-camif/ 9228 - F: include/media/s3c_camif.h 9228 + F: include/media/drv-intf/s3c_camif.h 9229 9229 9230 9230 SAMSUNG S5C73M3 CAMERA DRIVER 9231 9231 M: Kyungmin Park <kyungmin.park@samsung.com> ··· 9686 9686 L: linux-media@vger.kernel.org 9687 9687 S: Orphan 9688 9688 F: drivers/media/platform/sh_vou.c 9689 - F: include/media/sh_vou.h 9689 + F: include/media/drv-intf/sh_vou.h 9690 9690 9691 9691 SIMPLE FIRMWARE INTERFACE (SFI) 9692 9692 M: Len Brown <lenb@kernel.org>
+1 -1
arch/sh/boards/mach-ap325rxa/setup.c
··· 30 30 #include <media/i2c/ov772x.h> 31 31 #include <media/soc_camera.h> 32 32 #include <media/soc_camera_platform.h> 33 - #include <media/sh_mobile_ceu.h> 33 + #include <media/drv-intf/sh_mobile_ceu.h> 34 34 #include <video/sh_mobile_lcdc.h> 35 35 #include <asm/io.h> 36 36 #include <asm/clock.h>
+2 -2
arch/sh/boards/mach-ecovec24/setup.c
··· 38 38 #include <video/sh_mobile_lcdc.h> 39 39 #include <sound/sh_fsi.h> 40 40 #include <sound/simple_card.h> 41 - #include <media/sh_mobile_ceu.h> 41 + #include <media/drv-intf/sh_mobile_ceu.h> 42 42 #include <media/soc_camera.h> 43 43 #include <media/i2c/tw9910.h> 44 44 #include <media/i2c/mt9t112.h> ··· 901 901 }; 902 902 903 903 #include <media/i2c/ak881x.h> 904 - #include <media/sh_vou.h> 904 + #include <media/drv-intf/sh_vou.h> 905 905 906 906 static struct ak881x_pdata ak881x_pdata = { 907 907 .flags = AK881X_IF_MODE_SLAVE,
+1 -1
arch/sh/boards/mach-kfr2r09/setup.c
··· 29 29 #include <linux/sh_intc.h> 30 30 #include <media/i2c/rj54n1cb0c.h> 31 31 #include <media/soc_camera.h> 32 - #include <media/sh_mobile_ceu.h> 32 + #include <media/drv-intf/sh_mobile_ceu.h> 33 33 #include <video/sh_mobile_lcdc.h> 34 34 #include <asm/suspend.h> 35 35 #include <asm/clock.h>
+1 -1
arch/sh/boards/mach-migor/setup.c
··· 27 27 #include <linux/videodev2.h> 28 28 #include <linux/sh_intc.h> 29 29 #include <video/sh_mobile_lcdc.h> 30 - #include <media/sh_mobile_ceu.h> 30 + #include <media/drv-intf/sh_mobile_ceu.h> 31 31 #include <media/i2c/ov772x.h> 32 32 #include <media/soc_camera.h> 33 33 #include <media/i2c/tw9910.h>
+2 -2
arch/sh/boards/mach-se/7724/setup.c
··· 30 30 #include <linux/sh_intc.h> 31 31 #include <linux/videodev2.h> 32 32 #include <video/sh_mobile_lcdc.h> 33 - #include <media/sh_mobile_ceu.h> 33 + #include <media/drv-intf/sh_mobile_ceu.h> 34 34 #include <sound/sh_fsi.h> 35 35 #include <sound/simple_card.h> 36 36 #include <asm/io.h> ··· 535 535 }; 536 536 537 537 #include <media/i2c/ak881x.h> 538 - #include <media/sh_vou.h> 538 + #include <media/drv-intf/sh_vou.h> 539 539 540 540 static struct ak881x_pdata ak881x_pdata = { 541 541 .flags = AK881X_IF_MODE_SLAVE,
+1 -1
drivers/media/common/cx2341x.c
··· 27 27 #include <linux/videodev2.h> 28 28 29 29 #include <media/tuner.h> 30 - #include <media/cx2341x.h> 30 + #include <media/drv-intf/cx2341x.h> 31 31 #include <media/v4l2-common.h> 32 32 33 33 MODULE_DESCRIPTION("cx23415/6/8 driver");
+1 -1
drivers/media/common/saa7146/saa7146_core.c
··· 20 20 21 21 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 22 22 23 - #include <media/saa7146.h> 23 + #include <media/drv-intf/saa7146.h> 24 24 #include <linux/module.h> 25 25 26 26 static int saa7146_num;
+1 -1
drivers/media/common/saa7146/saa7146_fops.c
··· 1 1 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 2 2 3 - #include <media/saa7146_vv.h> 3 + #include <media/drv-intf/saa7146_vv.h> 4 4 #include <linux/module.h> 5 5 6 6 /****************************************************************************/
+1 -1
drivers/media/common/saa7146/saa7146_hlp.c
··· 2 2 3 3 #include <linux/kernel.h> 4 4 #include <linux/export.h> 5 - #include <media/saa7146_vv.h> 5 + #include <media/drv-intf/saa7146_vv.h> 6 6 7 7 static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format) 8 8 {
+1 -1
drivers/media/common/saa7146/saa7146_i2c.c
··· 1 1 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 2 2 3 - #include <media/saa7146_vv.h> 3 + #include <media/drv-intf/saa7146_vv.h> 4 4 5 5 static u32 saa7146_i2c_func(struct i2c_adapter *adapter) 6 6 {
+1 -1
drivers/media/common/saa7146/saa7146_vbi.c
··· 1 - #include <media/saa7146_vv.h> 1 + #include <media/drv-intf/saa7146_vv.h> 2 2 3 3 static int vbi_pixel_to_capture = 720 * 2; 4 4
+1 -1
drivers/media/common/saa7146/saa7146_video.c
··· 1 1 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 2 2 3 - #include <media/saa7146_vv.h> 3 + #include <media/drv-intf/saa7146_vv.h> 4 4 #include <media/v4l2-event.h> 5 5 #include <media/v4l2-ctrls.h> 6 6 #include <linux/module.h>
+1 -1
drivers/media/i2c/cx25840/cx25840-audio.c
··· 19 19 #include <linux/videodev2.h> 20 20 #include <linux/i2c.h> 21 21 #include <media/v4l2-common.h> 22 - #include <media/cx25840.h> 22 + #include <media/drv-intf/cx25840.h> 23 23 24 24 #include "cx25840-core.h" 25 25
+1 -1
drivers/media/i2c/cx25840/cx25840-core.c
··· 45 45 #include <linux/delay.h> 46 46 #include <linux/math64.h> 47 47 #include <media/v4l2-common.h> 48 - #include <media/cx25840.h> 48 + #include <media/drv-intf/cx25840.h> 49 49 50 50 #include "cx25840-core.h" 51 51
+1 -1
drivers/media/i2c/cx25840/cx25840-firmware.c
··· 19 19 #include <linux/i2c.h> 20 20 #include <linux/firmware.h> 21 21 #include <media/v4l2-common.h> 22 - #include <media/cx25840.h> 22 + #include <media/drv-intf/cx25840.h> 23 23 24 24 #include "cx25840-core.h" 25 25
+1 -1
drivers/media/i2c/cx25840/cx25840-ir.c
··· 24 24 #include <linux/slab.h> 25 25 #include <linux/kfifo.h> 26 26 #include <linux/module.h> 27 - #include <media/cx25840.h> 27 + #include <media/drv-intf/cx25840.h> 28 28 #include <media/rc-core.h> 29 29 30 30 #include "cx25840-core.h"
+1 -1
drivers/media/i2c/cx25840/cx25840-vbi.c
··· 19 19 #include <linux/videodev2.h> 20 20 #include <linux/i2c.h> 21 21 #include <media/v4l2-common.h> 22 - #include <media/cx25840.h> 22 + #include <media/drv-intf/cx25840.h> 23 23 24 24 #include "cx25840-core.h" 25 25
+1 -1
drivers/media/i2c/m5mols/m5mols_capture.c
··· 26 26 #include <media/v4l2-device.h> 27 27 #include <media/v4l2-subdev.h> 28 28 #include <media/i2c/m5mols.h> 29 - #include <media/exynos-fimc.h> 29 + #include <media/drv-intf/exynos-fimc.h> 30 30 31 31 #include "m5mols.h" 32 32 #include "m5mols_reg.h"
+1 -1
drivers/media/i2c/msp3400-driver.c
··· 56 56 #include <linux/videodev2.h> 57 57 #include <media/v4l2-device.h> 58 58 #include <media/v4l2-ioctl.h> 59 - #include <media/msp3400.h> 59 + #include <media/drv-intf/msp3400.h> 60 60 #include <media/i2c/tvaudio.h> 61 61 #include "msp3400-driver.h" 62 62
+1 -1
drivers/media/i2c/msp3400-driver.h
··· 4 4 #ifndef MSP3400_DRIVER_H 5 5 #define MSP3400_DRIVER_H 6 6 7 - #include <media/msp3400.h> 7 + #include <media/drv-intf/msp3400.h> 8 8 #include <media/v4l2-device.h> 9 9 #include <media/v4l2-ctrls.h> 10 10
+1 -1
drivers/media/i2c/msp3400-kthreads.c
··· 26 26 #include <linux/freezer.h> 27 27 #include <linux/videodev2.h> 28 28 #include <media/v4l2-common.h> 29 - #include <media/msp3400.h> 29 + #include <media/drv-intf/msp3400.h> 30 30 #include <linux/kthread.h> 31 31 #include <linux/suspend.h> 32 32 #include "msp3400-driver.h"
+1 -1
drivers/media/i2c/soc_camera/mt9m001.c
··· 15 15 #include <linux/module.h> 16 16 17 17 #include <media/soc_camera.h> 18 - #include <media/soc_mediabus.h> 18 + #include <media/drv-intf/soc_mediabus.h> 19 19 #include <media/v4l2-clk.h> 20 20 #include <media/v4l2-subdev.h> 21 21 #include <media/v4l2-ctrls.h>
+1 -1
drivers/media/i2c/soc_camera/mt9v022.c
··· 17 17 18 18 #include <media/i2c/mt9v022.h> 19 19 #include <media/soc_camera.h> 20 - #include <media/soc_mediabus.h> 20 + #include <media/drv-intf/soc_mediabus.h> 21 21 #include <media/v4l2-subdev.h> 22 22 #include <media/v4l2-clk.h> 23 23 #include <media/v4l2-ctrls.h>
+1 -1
drivers/media/pci/bt8xx/bttv-driver.c
··· 51 51 #include <media/v4l2-ioctl.h> 52 52 #include <media/v4l2-event.h> 53 53 #include <media/i2c/tvaudio.h> 54 - #include <media/msp3400.h> 54 + #include <media/drv-intf/msp3400.h> 55 55 56 56 #include <linux/dma-mapping.h> 57 57
+1 -1
drivers/media/pci/bt8xx/bttvp.h
··· 42 42 #include <media/tveeprom.h> 43 43 #include <media/rc-core.h> 44 44 #include <media/i2c/ir-kbd-i2c.h> 45 - #include <media/tea575x.h> 45 + #include <media/drv-intf/tea575x.h> 46 46 47 47 #include "bt848.h" 48 48 #include "bttv.h"
+1 -1
drivers/media/pci/cx18/cx23418.h
··· 22 22 #ifndef CX23418_H 23 23 #define CX23418_H 24 24 25 - #include <media/cx2341x.h> 25 + #include <media/drv-intf/cx2341x.h> 26 26 27 27 #define MGR_CMD_MASK 0x40000000 28 28 /* The MSB of the command code indicates that this is the completion of a
+1 -1
drivers/media/pci/cx23885/cx23885-417.c
··· 30 30 #include <linux/slab.h> 31 31 #include <media/v4l2-common.h> 32 32 #include <media/v4l2-ioctl.h> 33 - #include <media/cx2341x.h> 33 + #include <media/drv-intf/cx2341x.h> 34 34 35 35 #include "cx23885.h" 36 36 #include "cx23885-ioctl.h"
+1 -1
drivers/media/pci/cx23885/cx23885-cards.c
··· 19 19 #include <linux/module.h> 20 20 #include <linux/pci.h> 21 21 #include <linux/delay.h> 22 - #include <media/cx25840.h> 22 + #include <media/drv-intf/cx25840.h> 23 23 #include <linux/firmware.h> 24 24 #include <misc/altera.h> 25 25
+1 -1
drivers/media/pci/cx23885/cx23885-video.c
··· 35 35 #include "cx23885-ioctl.h" 36 36 #include "tuner-xc2028.h" 37 37 38 - #include <media/cx25840.h> 38 + #include <media/drv-intf/cx25840.h> 39 39 40 40 MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards"); 41 41 MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
+1 -1
drivers/media/pci/cx23885/cx23885.h
··· 30 30 #include <media/rc-core.h> 31 31 32 32 #include "cx23885-reg.h" 33 - #include "media/cx2341x.h" 33 + #include "media/drv-intf/cx2341x.h" 34 34 35 35 #include <linux/mutex.h> 36 36
+1 -1
drivers/media/pci/cx88/cx88-blackbird.c
··· 36 36 #include <media/v4l2-common.h> 37 37 #include <media/v4l2-ioctl.h> 38 38 #include <media/v4l2-event.h> 39 - #include <media/cx2341x.h> 39 + #include <media/drv-intf/cx2341x.h> 40 40 41 41 #include "cx88.h" 42 42
+1 -1
drivers/media/pci/cx88/cx88.h
··· 30 30 #include <media/tuner.h> 31 31 #include <media/tveeprom.h> 32 32 #include <media/videobuf2-dma-sg.h> 33 - #include <media/cx2341x.h> 33 + #include <media/drv-intf/cx2341x.h> 34 34 #include <media/videobuf2-dvb.h> 35 35 #include <media/i2c/ir-kbd-i2c.h> 36 36 #include <media/i2c/wm8775.h>
+2 -2
drivers/media/pci/ivtv/ivtv-cards.c
··· 22 22 #include "ivtv-cards.h" 23 23 #include "ivtv-i2c.h" 24 24 25 - #include <media/msp3400.h> 25 + #include <media/drv-intf/msp3400.h> 26 26 #include <media/i2c/m52790.h> 27 27 #include <media/i2c/wm8775.h> 28 28 #include <media/i2c/cs53l32a.h> 29 - #include <media/cx25840.h> 29 + #include <media/drv-intf/cx25840.h> 30 30 #include <media/i2c/upd64031a.h> 31 31 32 32 #define MSP_TUNER MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, \
+1 -1
drivers/media/pci/ivtv/ivtv-driver.h
··· 64 64 #include <media/v4l2-device.h> 65 65 #include <media/v4l2-fh.h> 66 66 #include <media/tuner.h> 67 - #include <media/cx2341x.h> 67 + #include <media/drv-intf/cx2341x.h> 68 68 #include <media/i2c/ir-kbd-i2c.h> 69 69 70 70 #include <linux/ivtv.h>
+1 -1
drivers/media/pci/ivtv/ivtv-i2c.c
··· 63 63 #include "ivtv-cards.h" 64 64 #include "ivtv-gpio.h" 65 65 #include "ivtv-i2c.h" 66 - #include <media/cx25840.h> 66 + #include <media/drv-intf/cx25840.h> 67 67 68 68 /* i2c implementation for cx23415/6 chip, ivtv project. 69 69 * Author: Kevin Thayer (nufan_wfk at yahoo.com)
+1 -1
drivers/media/pci/ivtv/ivtv-routing.c
··· 24 24 #include "ivtv-gpio.h" 25 25 #include "ivtv-routing.h" 26 26 27 - #include <media/msp3400.h> 27 + #include <media/drv-intf/msp3400.h> 28 28 #include <media/i2c/m52790.h> 29 29 #include <media/i2c/upd64031a.h> 30 30 #include <media/i2c/upd64083.h>
+1 -1
drivers/media/pci/saa7146/hexium_gemini.c
··· 25 25 26 26 #define DEBUG_VARIABLE debug 27 27 28 - #include <media/saa7146_vv.h> 28 + #include <media/drv-intf/saa7146_vv.h> 29 29 #include <linux/module.h> 30 30 31 31 static int debug;
+1 -1
drivers/media/pci/saa7146/hexium_orion.c
··· 25 25 26 26 #define DEBUG_VARIABLE debug 27 27 28 - #include <media/saa7146_vv.h> 28 + #include <media/drv-intf/saa7146_vv.h> 29 29 #include <linux/module.h> 30 30 31 31 static int debug;
+1 -1
drivers/media/pci/saa7146/mxb.c
··· 25 25 26 26 #define DEBUG_VARIABLE debug 27 27 28 - #include <media/saa7146_vv.h> 28 + #include <media/drv-intf/saa7146_vv.h> 29 29 #include <media/tuner.h> 30 30 #include <media/v4l2-common.h> 31 31 #include <media/i2c/saa7115.h>
+1 -1
drivers/media/pci/ttpci/av7110.h
··· 32 32 #include "stv0297.h" 33 33 #include "l64781.h" 34 34 35 - #include <media/saa7146_vv.h> 35 + #include <media/drv-intf/saa7146_vv.h> 36 36 37 37 38 38 #define ANALOG_TUNER_VES1820 1
+1 -1
drivers/media/pci/ttpci/budget-av.c
··· 46 46 #include "tda1004x.h" 47 47 #include "tua6100.h" 48 48 #include "dvb-pll.h" 49 - #include <media/saa7146_vv.h> 49 + #include <media/drv-intf/saa7146_vv.h> 50 50 #include <linux/module.h> 51 51 #include <linux/errno.h> 52 52 #include <linux/slab.h>
+1 -1
drivers/media/pci/ttpci/budget.h
··· 13 13 #include <linux/module.h> 14 14 #include <linux/mutex.h> 15 15 16 - #include <media/saa7146.h> 16 + #include <media/drv-intf/saa7146.h> 17 17 18 18 extern int budget_debug; 19 19
+1 -1
drivers/media/platform/exynos4-is/common.c
··· 10 10 */ 11 11 12 12 #include <linux/module.h> 13 - #include <media/exynos-fimc.h> 13 + #include <media/drv-intf/exynos-fimc.h> 14 14 #include "common.h" 15 15 16 16 /* Called with the media graph mutex held or entity->stream_count > 0. */
+1 -1
drivers/media/platform/exynos4-is/fimc-core.h
··· 27 27 #include <media/v4l2-device.h> 28 28 #include <media/v4l2-mem2mem.h> 29 29 #include <media/v4l2-mediabus.h> 30 - #include <media/exynos-fimc.h> 30 + #include <media/drv-intf/exynos-fimc.h> 31 31 32 32 #define dbg(fmt, args...) \ 33 33 pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
+1 -1
drivers/media/platform/exynos4-is/fimc-isp-video.c
··· 30 30 #include <media/v4l2-ioctl.h> 31 31 #include <media/videobuf2-v4l2.h> 32 32 #include <media/videobuf2-dma-contig.h> 33 - #include <media/exynos-fimc.h> 33 + #include <media/drv-intf/exynos-fimc.h> 34 34 35 35 #include "common.h" 36 36 #include "media-dev.h"
+1 -1
drivers/media/platform/exynos4-is/fimc-isp.h
··· 24 24 #include <media/videobuf2-v4l2.h> 25 25 #include <media/v4l2-device.h> 26 26 #include <media/v4l2-mediabus.h> 27 - #include <media/exynos-fimc.h> 27 + #include <media/drv-intf/exynos-fimc.h> 28 28 29 29 extern int fimc_isp_debug; 30 30
+1 -1
drivers/media/platform/exynos4-is/fimc-lite-reg.c
··· 12 12 #include <linux/bitops.h> 13 13 #include <linux/delay.h> 14 14 #include <linux/io.h> 15 - #include <media/exynos-fimc.h> 15 + #include <media/drv-intf/exynos-fimc.h> 16 16 17 17 #include "fimc-lite-reg.h" 18 18 #include "fimc-lite.h"
+1 -1
drivers/media/platform/exynos4-is/fimc-lite.c
··· 30 30 #include <media/v4l2-mem2mem.h> 31 31 #include <media/videobuf2-v4l2.h> 32 32 #include <media/videobuf2-dma-contig.h> 33 - #include <media/exynos-fimc.h> 33 + #include <media/drv-intf/exynos-fimc.h> 34 34 35 35 #include "common.h" 36 36 #include "fimc-core.h"
+1 -1
drivers/media/platform/exynos4-is/fimc-lite.h
··· 23 23 #include <media/v4l2-ctrls.h> 24 24 #include <media/v4l2-device.h> 25 25 #include <media/v4l2-mediabus.h> 26 - #include <media/exynos-fimc.h> 26 + #include <media/drv-intf/exynos-fimc.h> 27 27 28 28 #define FIMC_LITE_DRV_NAME "exynos-fimc-lite" 29 29 #define FLITE_CLK_NAME "flite"
+1 -1
drivers/media/platform/exynos4-is/fimc-reg.c
··· 13 13 #include <linux/io.h> 14 14 #include <linux/regmap.h> 15 15 16 - #include <media/exynos-fimc.h> 16 + #include <media/drv-intf/exynos-fimc.h> 17 17 #include "media-dev.h" 18 18 19 19 #include "fimc-reg.h"
+1 -1
drivers/media/platform/exynos4-is/media-dev.c
··· 31 31 #include <media/v4l2-ctrls.h> 32 32 #include <media/v4l2-of.h> 33 33 #include <media/media-device.h> 34 - #include <media/exynos-fimc.h> 34 + #include <media/drv-intf/exynos-fimc.h> 35 35 36 36 #include "media-dev.h" 37 37 #include "fimc-core.h"
+1 -1
drivers/media/platform/exynos4-is/media-dev.h
··· 19 19 #include <media/media-entity.h> 20 20 #include <media/v4l2-device.h> 21 21 #include <media/v4l2-subdev.h> 22 - #include <media/exynos-fimc.h> 22 + #include <media/drv-intf/exynos-fimc.h> 23 23 24 24 #include "fimc-core.h" 25 25 #include "fimc-lite.h"
+1 -1
drivers/media/platform/exynos4-is/mipi-csis.c
··· 29 29 #include <linux/slab.h> 30 30 #include <linux/spinlock.h> 31 31 #include <linux/videodev2.h> 32 - #include <media/exynos-fimc.h> 32 + #include <media/drv-intf/exynos-fimc.h> 33 33 #include <media/v4l2-of.h> 34 34 #include <media/v4l2-subdev.h> 35 35
+1 -1
drivers/media/platform/s3c-camif/camif-core.h
··· 26 26 #include <media/v4l2-device.h> 27 27 #include <media/v4l2-mediabus.h> 28 28 #include <media/videobuf2-v4l2.h> 29 - #include <media/s3c_camif.h> 29 + #include <media/drv-intf/s3c_camif.h> 30 30 31 31 #define S3C_CAMIF_DRIVER_NAME "s3c-camif" 32 32 #define CAMIF_REQ_BUFS_MIN 3
+1 -1
drivers/media/platform/s3c-camif/camif-regs.h
··· 13 13 #define CAMIF_REGS_H_ 14 14 15 15 #include "camif-core.h" 16 - #include <media/s3c_camif.h> 16 + #include <media/drv-intf/s3c_camif.h> 17 17 18 18 /* 19 19 * The id argument indicates the processing path:
+1 -1
drivers/media/platform/sh_vou.c
··· 22 22 #include <linux/videodev2.h> 23 23 #include <linux/module.h> 24 24 25 - #include <media/sh_vou.h> 25 + #include <media/drv-intf/sh_vou.h> 26 26 #include <media/v4l2-common.h> 27 27 #include <media/v4l2-device.h> 28 28 #include <media/v4l2-ioctl.h>
+1 -1
drivers/media/platform/soc_camera/atmel-isi.c
··· 24 24 #include <linux/slab.h> 25 25 26 26 #include <media/soc_camera.h> 27 - #include <media/soc_mediabus.h> 27 + #include <media/drv-intf/soc_mediabus.h> 28 28 #include <media/v4l2-of.h> 29 29 #include <media/videobuf2-dma-contig.h> 30 30
+1 -1
drivers/media/platform/soc_camera/mx2_camera.c
··· 35 35 #include <media/videobuf2-v4l2.h> 36 36 #include <media/videobuf2-dma-contig.h> 37 37 #include <media/soc_camera.h> 38 - #include <media/soc_mediabus.h> 38 + #include <media/drv-intf/soc_mediabus.h> 39 39 40 40 #include <linux/videodev2.h> 41 41
+1 -1
drivers/media/platform/soc_camera/mx3_camera.c
··· 23 23 #include <media/v4l2-dev.h> 24 24 #include <media/videobuf2-dma-contig.h> 25 25 #include <media/soc_camera.h> 26 - #include <media/soc_mediabus.h> 26 + #include <media/drv-intf/soc_mediabus.h> 27 27 28 28 #include <linux/platform_data/camera-mx3.h> 29 29 #include <linux/platform_data/dma-imx.h>
+1 -1
drivers/media/platform/soc_camera/omap1_camera.c
··· 30 30 31 31 #include <media/omap1_camera.h> 32 32 #include <media/soc_camera.h> 33 - #include <media/soc_mediabus.h> 33 + #include <media/drv-intf/soc_mediabus.h> 34 34 #include <media/videobuf-dma-contig.h> 35 35 #include <media/videobuf-dma-sg.h> 36 36
+1 -1
drivers/media/platform/soc_camera/pxa_camera.c
··· 33 33 #include <media/v4l2-dev.h> 34 34 #include <media/videobuf-dma-sg.h> 35 35 #include <media/soc_camera.h> 36 - #include <media/soc_mediabus.h> 36 + #include <media/drv-intf/soc_mediabus.h> 37 37 #include <media/v4l2-of.h> 38 38 39 39 #include <linux/videodev2.h>
+1 -1
drivers/media/platform/soc_camera/rcar_vin.c
··· 28 28 #include <linux/videodev2.h> 29 29 30 30 #include <media/soc_camera.h> 31 - #include <media/soc_mediabus.h> 31 + #include <media/drv-intf/soc_mediabus.h> 32 32 #include <media/v4l2-common.h> 33 33 #include <media/v4l2-dev.h> 34 34 #include <media/v4l2-device.h>
+3 -3
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
··· 40 40 #include <media/v4l2-common.h> 41 41 #include <media/v4l2-dev.h> 42 42 #include <media/soc_camera.h> 43 - #include <media/sh_mobile_ceu.h> 44 - #include <media/sh_mobile_csi2.h> 43 + #include <media/drv-intf/sh_mobile_ceu.h> 44 + #include <media/drv-intf/sh_mobile_csi2.h> 45 45 #include <media/videobuf2-dma-contig.h> 46 46 #include <media/v4l2-mediabus.h> 47 - #include <media/soc_mediabus.h> 47 + #include <media/drv-intf/soc_mediabus.h> 48 48 49 49 #include "soc_scale_crop.h" 50 50
+3 -3
drivers/media/platform/soc_camera/sh_mobile_csi2.c
··· 18 18 #include <linux/videodev2.h> 19 19 #include <linux/module.h> 20 20 21 - #include <media/sh_mobile_ceu.h> 22 - #include <media/sh_mobile_csi2.h> 21 + #include <media/drv-intf/sh_mobile_ceu.h> 22 + #include <media/drv-intf/sh_mobile_csi2.h> 23 23 #include <media/soc_camera.h> 24 - #include <media/soc_mediabus.h> 24 + #include <media/drv-intf/soc_mediabus.h> 25 25 #include <media/v4l2-common.h> 26 26 #include <media/v4l2-dev.h> 27 27 #include <media/v4l2-device.h>
+1 -1
drivers/media/platform/soc_camera/soc_camera.c
··· 30 30 #include <linux/vmalloc.h> 31 31 32 32 #include <media/soc_camera.h> 33 - #include <media/soc_mediabus.h> 33 + #include <media/drv-intf/soc_mediabus.h> 34 34 #include <media/v4l2-async.h> 35 35 #include <media/v4l2-clk.h> 36 36 #include <media/v4l2-common.h>
+1 -1
drivers/media/platform/soc_camera/soc_mediabus.c
··· 13 13 14 14 #include <media/v4l2-device.h> 15 15 #include <media/v4l2-mediabus.h> 16 - #include <media/soc_mediabus.h> 16 + #include <media/drv-intf/soc_mediabus.h> 17 17 18 18 static const struct soc_mbus_lookup mbus_fmt[] = { 19 19 {
+1 -1
drivers/media/radio/radio-maxiradio.c
··· 42 42 #include <linux/videodev2.h> 43 43 #include <linux/io.h> 44 44 #include <linux/slab.h> 45 - #include <media/tea575x.h> 45 + #include <media/drv-intf/tea575x.h> 46 46 #include <media/v4l2-device.h> 47 47 #include <media/v4l2-ioctl.h> 48 48 #include <media/v4l2-fh.h>
+1 -1
drivers/media/radio/radio-sf16fmr2.c
··· 14 14 #include <linux/io.h> /* outb, outb_p */ 15 15 #include <linux/isa.h> 16 16 #include <linux/pnp.h> 17 - #include <media/tea575x.h> 17 + #include <media/drv-intf/tea575x.h> 18 18 19 19 MODULE_AUTHOR("Ondrej Zary"); 20 20 MODULE_DESCRIPTION("MediaForte SF16-FMR2 and SF16-FMD2 FM radio card driver");
+1 -1
drivers/media/radio/radio-shark.c
··· 33 33 #include <linux/usb.h> 34 34 #include <linux/workqueue.h> 35 35 #include <media/v4l2-device.h> 36 - #include <media/tea575x.h> 36 + #include <media/drv-intf/tea575x.h> 37 37 38 38 #if defined(CONFIG_LEDS_CLASS) || \ 39 39 (defined(CONFIG_LEDS_CLASS_MODULE) && defined(CONFIG_RADIO_SHARK_MODULE))
+1 -1
drivers/media/radio/radio-si476x.c
··· 31 31 #include <media/v4l2-event.h> 32 32 #include <media/v4l2-device.h> 33 33 34 - #include <media/si476x.h> 34 + #include <media/drv-intf/si476x.h> 35 35 #include <linux/mfd/si476x-core.h> 36 36 37 37 #define FM_FREQ_RANGE_LOW 64000000
+1 -1
drivers/media/radio/tea575x.c
··· 31 31 #include <media/v4l2-fh.h> 32 32 #include <media/v4l2-ioctl.h> 33 33 #include <media/v4l2-event.h> 34 - #include <media/tea575x.h> 34 + #include <media/drv-intf/tea575x.h> 35 35 36 36 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); 37 37 MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");
+1 -1
drivers/media/usb/cx231xx/cx231xx-417.c
··· 37 37 #include <media/v4l2-common.h> 38 38 #include <media/v4l2-ioctl.h> 39 39 #include <media/v4l2-event.h> 40 - #include <media/cx2341x.h> 40 + #include <media/drv-intf/cx2341x.h> 41 41 #include <media/tuner.h> 42 42 43 43 #define CX231xx_FIRM_IMAGE_SIZE 376836
+1 -1
drivers/media/usb/cx231xx/cx231xx-cards.c
··· 30 30 #include <media/tveeprom.h> 31 31 #include <media/v4l2-common.h> 32 32 33 - #include <media/cx25840.h> 33 + #include <media/drv-intf/cx25840.h> 34 34 #include "dvb-usb-ids.h" 35 35 #include "xc5000.h" 36 36 #include "tda18271.h"
+1 -1
drivers/media/usb/cx231xx/cx231xx-vbi.c
··· 32 32 33 33 #include <media/v4l2-common.h> 34 34 #include <media/v4l2-ioctl.h> 35 - #include <media/msp3400.h> 35 + #include <media/drv-intf/msp3400.h> 36 36 #include <media/tuner.h> 37 37 38 38 #include "cx231xx-vbi.h"
+1 -1
drivers/media/usb/cx231xx/cx231xx-video.c
··· 36 36 #include <media/v4l2-common.h> 37 37 #include <media/v4l2-ioctl.h> 38 38 #include <media/v4l2-event.h> 39 - #include <media/msp3400.h> 39 + #include <media/drv-intf/msp3400.h> 40 40 #include <media/tuner.h> 41 41 42 42 #include "dvb_frontend.h"
+1 -1
drivers/media/usb/cx231xx/cx231xx.h
··· 30 30 #include <linux/mutex.h> 31 31 #include <linux/usb.h> 32 32 33 - #include <media/cx2341x.h> 33 + #include <media/drv-intf/cx2341x.h> 34 34 35 35 #include <media/videobuf-vmalloc.h> 36 36 #include <media/v4l2-device.h>
+1 -1
drivers/media/usb/em28xx/em28xx-cards.c
··· 30 30 #include <linux/i2c.h> 31 31 #include <linux/usb.h> 32 32 #include <media/tuner.h> 33 - #include <media/msp3400.h> 33 + #include <media/drv-intf/msp3400.h> 34 34 #include <media/i2c/saa7115.h> 35 35 #include <media/i2c/tvp5150.h> 36 36 #include <media/i2c/tvaudio.h>
+1 -1
drivers/media/usb/em28xx/em28xx-video.c
··· 43 43 #include <media/v4l2-ioctl.h> 44 44 #include <media/v4l2-event.h> 45 45 #include <media/v4l2-clk.h> 46 - #include <media/msp3400.h> 46 + #include <media/drv-intf/msp3400.h> 47 47 #include <media/tuner.h> 48 48 49 49 #define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
+1 -1
drivers/media/usb/pvrusb2/pvrusb2-audio.c
··· 23 23 #include "pvrusb2-hdw-internal.h" 24 24 #include "pvrusb2-debug.h" 25 25 #include <linux/videodev2.h> 26 - #include <media/msp3400.h> 26 + #include <media/drv-intf/msp3400.h> 27 27 #include <media/v4l2-common.h> 28 28 29 29
+1 -1
drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c
··· 32 32 33 33 #include "pvrusb2-hdw-internal.h" 34 34 #include "pvrusb2-debug.h" 35 - #include <media/cx25840.h> 35 + #include <media/drv-intf/cx25840.h> 36 36 #include <linux/videodev2.h> 37 37 #include <media/v4l2-common.h> 38 38 #include <linux/errno.h>
+1 -1
drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h
··· 39 39 #include "pvrusb2-hdw.h" 40 40 #include "pvrusb2-io.h" 41 41 #include <media/v4l2-device.h> 42 - #include <media/cx2341x.h> 42 + #include <media/drv-intf/cx2341x.h> 43 43 #include <media/i2c/ir-kbd-i2c.h> 44 44 #include "pvrusb2-devattr.h" 45 45
include/media/cx2341x.h include/media/drv-intf/cx2341x.h
include/media/cx25840.h include/media/drv-intf/cx25840.h
include/media/exynos-fimc.h include/media/drv-intf/exynos-fimc.h
-1
include/media/msp3400.h include/media/drv-intf/msp3400.h
··· 223 223 */ 224 224 225 225 #endif /* MSP3400_H */ 226 -
include/media/s3c_camif.h include/media/drv-intf/s3c_camif.h
include/media/saa7146.h include/media/drv-intf/saa7146.h
+1 -1
include/media/saa7146_vv.h include/media/drv-intf/saa7146_vv.h
··· 4 4 #include <media/v4l2-common.h> 5 5 #include <media/v4l2-ioctl.h> 6 6 #include <media/v4l2-fh.h> 7 - #include <media/saa7146.h> 7 + #include <media/drv-intf/saa7146.h> 8 8 #include <media/videobuf-dma-sg.h> 9 9 10 10 #define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */
include/media/sh_mobile_ceu.h include/media/drv-intf/sh_mobile_ceu.h
include/media/sh_mobile_csi2.h include/media/drv-intf/sh_mobile_csi2.h
include/media/sh_vou.h include/media/drv-intf/sh_vou.h
+1 -1
include/media/si476x.h include/media/drv-intf/si476x.h
··· 1 1 /* 2 - * include/media/si476x.h -- Common definitions for si476x driver 2 + * include/media/drv-intf/si476x.h -- Common definitions for si476x driver 3 3 * 4 4 * Copyright (C) 2012 Innovative Converged Devices(ICD) 5 5 * Copyright (C) 2013 Andrey Smirnov
include/media/soc_mediabus.h include/media/drv-intf/soc_mediabus.h
include/media/tea575x.h include/media/drv-intf/tea575x.h
+4 -2
include/uapi/linux/v4l2-controls.h
··· 158 158 * We reserve 16 controls for this driver. */ 159 159 #define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030) 160 160 161 - /* The base for the si476x driver controls. See include/media/si476x.h for the list 162 - * of controls. Total of 16 controls is reserved for this driver */ 161 + /* 162 + * The base for the si476x driver controls. See include/media/drv-intf/si476x.h 163 + * for the list of controls. Total of 16 controls is reserved for this driver 164 + */ 163 165 #define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040) 164 166 165 167 /* The base for the TI VPE driver controls. Total of 16 controls is reserved for
+1 -1
sound/pci/es1968.c
··· 113 113 #include <sound/initval.h> 114 114 115 115 #ifdef CONFIG_SND_ES1968_RADIO 116 - #include <media/tea575x.h> 116 + #include <media/drv-intf/tea575x.h> 117 117 #endif 118 118 119 119 #define CARD_NAME "ESS Maestro1/2"
+1 -1
sound/pci/fm801.c
··· 30 30 #include <sound/initval.h> 31 31 32 32 #ifdef CONFIG_SND_FM801_TEA575X_BOOL 33 - #include <media/tea575x.h> 33 + #include <media/drv-intf/tea575x.h> 34 34 #endif 35 35 36 36 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");