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

[media] dvb: move the dvb core one level up

just like the V4L2 core, move the DVB core to drivers/media, as the
intention is to get rid of both "video" and "dvb" directories.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

+68 -65
+1
drivers/media/Kconfig
··· 161 161 # DVB adapters 162 162 # 163 163 164 + source "drivers/media/dvb-core/Kconfig" 164 165 source "drivers/media/dvb/Kconfig" 165 166 166 167 endif # MEDIA_SUPPORT
+1 -1
drivers/media/Makefile
··· 11 11 obj-y += v4l2-core/ common/ rc/ video/ 12 12 13 13 obj-$(CONFIG_VIDEO_DEV) += radio/ 14 - obj-$(CONFIG_DVB_CORE) += dvb/ 14 + obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/
+1 -1
drivers/media/common/tuners/Makefile
··· 33 33 obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o 34 34 obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o 35 35 36 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 36 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 37 37 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+29
drivers/media/dvb-core/Kconfig
··· 1 + # 2 + # DVB device configuration 3 + # 4 + 5 + config DVB_MAX_ADAPTERS 6 + int "maximum number of DVB/ATSC adapters" 7 + depends on DVB_CORE 8 + default 8 9 + range 1 255 10 + help 11 + Maximum number of DVB/ATSC adapters. Increasing this number 12 + increases the memory consumption of the DVB subsystem even 13 + if a much lower number of DVB/ATSC adapters is present. 14 + Only values in the range 4-32 are tested. 15 + 16 + If you are unsure about this, use the default value 8 17 + 18 + config DVB_DYNAMIC_MINORS 19 + bool "Dynamic DVB minor allocation" 20 + depends on DVB_CORE 21 + default n 22 + help 23 + If you say Y here, the DVB subsystem will use dynamic minor 24 + allocation for any device that uses the DVB major number. 25 + This means that you can have more than 4 of a single type 26 + of device (like demuxes and frontends) per adapter, but udev 27 + will be required to manage the device nodes. 28 + 29 + If you are unsure about this, say N here.
-26
drivers/media/dvb/Kconfig
··· 2 2 # DVB device configuration 3 3 # 4 4 5 - config DVB_MAX_ADAPTERS 6 - int "maximum number of DVB/ATSC adapters" 7 - depends on DVB_CORE 8 - default 8 9 - range 1 255 10 - help 11 - Maximum number of DVB/ATSC adapters. Increasing this number 12 - increases the memory consumption of the DVB subsystem even 13 - if a much lower number of DVB/ATSC adapters is present. 14 - Only values in the range 4-32 are tested. 15 - 16 - If you are unsure about this, use the default value 8 17 - 18 - config DVB_DYNAMIC_MINORS 19 - bool "Dynamic DVB minor allocation" 20 - depends on DVB_CORE 21 - default n 22 - help 23 - If you say Y here, the DVB subsystem will use dynamic minor 24 - allocation for any device that uses the DVB major number. 25 - This means that you can have more than 4 of a single type 26 - of device (like demuxes and frontends) per adapter, but udev 27 - will be required to manage the device nodes. 28 - 29 - If you are unsure about this, say N here. 30 - 31 5 menuconfig DVB_CAPTURE_DRIVERS 32 6 bool "DVB/ATSC adapters" 33 7 depends on DVB_CORE
+1 -2
drivers/media/dvb/Makefile
··· 2 2 # Makefile for the kernel multimedia device drivers. 3 3 # 4 4 5 - obj-y := dvb-core/ \ 6 - frontends/ \ 5 + obj-y := frontends/ \ 7 6 ttpci/ \ 8 7 ttusb-dec/ \ 9 8 ttusb-budget/ \
+1 -1
drivers/media/dvb/b2c2/Makefile
··· 12 12 b2c2-flexcop-usb-objs = flexcop-usb.o 13 13 obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o 14 14 15 - ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 15 + ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/ 16 16 ccflags-y += -Idrivers/media/common/tuners/
+1 -1
drivers/media/dvb/bt8xx/Makefile
··· 1 1 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o 2 2 3 - ccflags-y += -Idrivers/media/dvb/dvb-core 3 + ccflags-y += -Idrivers/media/dvb-core 4 4 ccflags-y += -Idrivers/media/dvb/frontends 5 5 ccflags-y += -Idrivers/media/video/bt8xx 6 6 ccflags-y += -Idrivers/media/common/tuners
+1 -1
drivers/media/dvb/ddbridge/Makefile
··· 6 6 7 7 obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o 8 8 9 - ccflags-y += -Idrivers/media/dvb/dvb-core/ 9 + ccflags-y += -Idrivers/media/dvb-core/ 10 10 ccflags-y += -Idrivers/media/dvb/frontends/ 11 11 ccflags-y += -Idrivers/media/common/tuners/ 12 12
+1 -1
drivers/media/dvb/dm1105/Makefile
··· 1 1 obj-$(CONFIG_DVB_DM1105) += dm1105.o 2 2 3 - ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends 3 + ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
drivers/media/dvb/dvb-core/Makefile drivers/media/dvb-core/Makefile
drivers/media/dvb/dvb-core/demux.h drivers/media/dvb-core/demux.h
drivers/media/dvb/dvb-core/dmxdev.c drivers/media/dvb-core/dmxdev.c
drivers/media/dvb/dvb-core/dmxdev.h drivers/media/dvb-core/dmxdev.h
drivers/media/dvb/dvb-core/dvb-usb-ids.h drivers/media/dvb-core/dvb-usb-ids.h
drivers/media/dvb/dvb-core/dvb_ca_en50221.c drivers/media/dvb-core/dvb_ca_en50221.c
drivers/media/dvb/dvb-core/dvb_ca_en50221.h drivers/media/dvb-core/dvb_ca_en50221.h
drivers/media/dvb/dvb-core/dvb_demux.c drivers/media/dvb-core/dvb_demux.c
drivers/media/dvb/dvb-core/dvb_demux.h drivers/media/dvb-core/dvb_demux.h
drivers/media/dvb/dvb-core/dvb_filter.c drivers/media/dvb-core/dvb_filter.c
drivers/media/dvb/dvb-core/dvb_filter.h drivers/media/dvb-core/dvb_filter.h
drivers/media/dvb/dvb-core/dvb_frontend.c drivers/media/dvb-core/dvb_frontend.c
drivers/media/dvb/dvb-core/dvb_frontend.h drivers/media/dvb-core/dvb_frontend.h
drivers/media/dvb/dvb-core/dvb_math.c drivers/media/dvb-core/dvb_math.c
drivers/media/dvb/dvb-core/dvb_math.h drivers/media/dvb-core/dvb_math.h
drivers/media/dvb/dvb-core/dvb_net.c drivers/media/dvb-core/dvb_net.c
drivers/media/dvb/dvb-core/dvb_net.h drivers/media/dvb-core/dvb_net.h
drivers/media/dvb/dvb-core/dvb_ringbuffer.c drivers/media/dvb-core/dvb_ringbuffer.c
drivers/media/dvb/dvb-core/dvb_ringbuffer.h drivers/media/dvb-core/dvb_ringbuffer.h
drivers/media/dvb/dvb-core/dvbdev.c drivers/media/dvb-core/dvbdev.c
drivers/media/dvb/dvb-core/dvbdev.h drivers/media/dvb-core/dvbdev.h
+1 -1
drivers/media/dvb/dvb-usb-v2/Makefile
··· 42 42 dvb-usb-rtl28xxu-objs = rtl28xxu.o 43 43 obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o 44 44 45 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 45 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 46 46 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/ 47 47 ccflags-y += -I$(srctree)/drivers/media/common/tuners 48 48
+1 -1
drivers/media/dvb/dvb-usb/Makefile
··· 75 75 dvb-usb-technisat-usb2-objs = technisat-usb2.o 76 76 obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o 77 77 78 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 78 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 79 79 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/ 80 80 # due to tuner-xc3028 81 81 ccflags-y += -I$(srctree)/drivers/media/common/tuners
+1 -1
drivers/media/dvb/firewire/Makefile
··· 3 3 firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o 4 4 firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o 5 5 6 - ccflags-y += -Idrivers/media/dvb/dvb-core 6 + ccflags-y += -Idrivers/media/dvb-core
+1 -1
drivers/media/dvb/frontends/Makefile
··· 2 2 # Makefile for the kernel DVB frontend device drivers. 3 3 # 4 4 5 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core/ 5 + ccflags-y += -I$(srctree)/drivers/media/dvb-core/ 6 6 ccflags-y += -I$(srctree)/drivers/media/common/tuners/ 7 7 8 8 stb0899-objs = stb0899_drv.o stb0899_algo.o
+1 -1
drivers/media/dvb/mantis/Makefile
··· 25 25 obj-$(CONFIG_DVB_MANTIS) += mantis.o 26 26 obj-$(CONFIG_DVB_HOPPER) += hopper.o 27 27 28 - ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 28 + ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
+1 -1
drivers/media/dvb/ngene/Makefile
··· 6 6 7 7 obj-$(CONFIG_DVB_NGENE) += ngene.o 8 8 9 - ccflags-y += -Idrivers/media/dvb/dvb-core/ 9 + ccflags-y += -Idrivers/media/dvb-core/ 10 10 ccflags-y += -Idrivers/media/dvb/frontends/ 11 11 ccflags-y += -Idrivers/media/common/tuners/ 12 12
+1 -1
drivers/media/dvb/pluto2/Makefile
··· 1 1 obj-$(CONFIG_DVB_PLUTO2) += pluto2.o 2 2 3 - ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 3 + ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
+1 -1
drivers/media/dvb/pt1/Makefile
··· 2 2 3 3 obj-$(CONFIG_DVB_PT1) += earth-pt1.o 4 4 5 - ccflags-y += -Idrivers/media/dvb/dvb-core -Idrivers/media/dvb/frontends 5 + ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb/frontends
+1 -1
drivers/media/dvb/siano/Makefile
··· 5 5 obj-$(CONFIG_SMS_USB_DRV) += smsusb.o 6 6 obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o 7 7 8 - ccflags-y += -Idrivers/media/dvb/dvb-core 8 + ccflags-y += -Idrivers/media/dvb-core 9 9 10 10 ccflags-y += $(extra-cflags-y) $(extra-cflags-m) 11 11
+1 -1
drivers/media/dvb/ttpci/Makefile
··· 17 17 obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o 18 18 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o 19 19 20 - ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 20 + ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/ 21 21 ccflags-y += -Idrivers/media/common/tuners
+1 -1
drivers/media/dvb/ttusb-budget/Makefile
··· 1 1 obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o 2 2 3 - ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends 3 + ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
+1 -1
drivers/media/dvb/ttusb-dec/Makefile
··· 1 1 obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o 2 2 3 - ccflags-y += -Idrivers/media/dvb/dvb-core/ 3 + ccflags-y += -Idrivers/media/dvb-core/
+1 -1
drivers/media/v4l2-core/Makefile
··· 29 29 obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o 30 30 obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o 31 31 32 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 32 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 33 33 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 34 34 ccflags-y += -I$(srctree)/drivers/media/common/tuners 35 35
+1 -1
drivers/media/video/Makefile
··· 190 190 191 191 obj-$(CONFIG_ARCH_OMAP) += omap/ 192 192 193 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 193 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 194 194 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 195 195 ccflags-y += -I$(srctree)/drivers/media/common/tuners
+1 -1
drivers/media/video/au0828/Makefile
··· 3 3 obj-$(CONFIG_VIDEO_AU0828) += au0828.o 4 4 5 5 ccflags-y += -Idrivers/media/common/tuners 6 - ccflags-y += -Idrivers/media/dvb/dvb-core 6 + ccflags-y += -Idrivers/media/dvb-core 7 7 ccflags-y += -Idrivers/media/dvb/frontends 8 8 9 9 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+1 -1
drivers/media/video/bt8xx/Makefile
··· 10 10 11 11 ccflags-y += -Idrivers/media/video 12 12 ccflags-y += -Idrivers/media/common/tuners 13 - ccflags-y += -Idrivers/media/dvb/dvb-core 13 + ccflags-y += -Idrivers/media/dvb-core
+1 -1
drivers/media/video/cx18/Makefile
··· 8 8 obj-$(CONFIG_VIDEO_CX18) += cx18.o 9 9 obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o 10 10 11 - ccflags-y += -Idrivers/media/dvb/dvb-core 11 + ccflags-y += -Idrivers/media/dvb-core 12 12 ccflags-y += -Idrivers/media/dvb/frontends 13 13 ccflags-y += -Idrivers/media/common/tuners
+1 -1
drivers/media/video/cx231xx/Makefile
··· 10 10 11 11 ccflags-y += -Idrivers/media/video 12 12 ccflags-y += -Idrivers/media/common/tuners 13 - ccflags-y += -Idrivers/media/dvb/dvb-core 13 + ccflags-y += -Idrivers/media/dvb-core 14 14 ccflags-y += -Idrivers/media/dvb/frontends 15 15
+1 -1
drivers/media/video/cx23885/Makefile
··· 9 9 10 10 ccflags-y += -Idrivers/media/video 11 11 ccflags-y += -Idrivers/media/common/tuners 12 - ccflags-y += -Idrivers/media/dvb/dvb-core 12 + ccflags-y += -Idrivers/media/dvb-core 13 13 ccflags-y += -Idrivers/media/dvb/frontends 14 14 15 15 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+1 -1
drivers/media/video/cx25821/Makefile
··· 9 9 10 10 ccflags-y := -Idrivers/media/video 11 11 ccflags-y += -Idrivers/media/common/tuners 12 - ccflags-y += -Idrivers/media/dvb/dvb-core 12 + ccflags-y += -Idrivers/media/dvb-core 13 13 ccflags-y += -Idrivers/media/dvb/frontends
+1 -1
drivers/media/video/cx88/Makefile
··· 12 12 13 13 ccflags-y += -Idrivers/media/video 14 14 ccflags-y += -Idrivers/media/common/tuners 15 - ccflags-y += -Idrivers/media/dvb/dvb-core 15 + ccflags-y += -Idrivers/media/dvb-core 16 16 ccflags-y += -Idrivers/media/dvb/frontends
+1 -1
drivers/media/video/em28xx/Makefile
··· 11 11 12 12 ccflags-y += -Idrivers/media/video 13 13 ccflags-y += -Idrivers/media/common/tuners 14 - ccflags-y += -Idrivers/media/dvb/dvb-core 14 + ccflags-y += -Idrivers/media/dvb-core 15 15 ccflags-y += -Idrivers/media/dvb/frontends
+1 -1
drivers/media/video/ivtv/Makefile
··· 9 9 10 10 ccflags-y += -I$(srctree)/drivers/media/video 11 11 ccflags-y += -I$(srctree)/drivers/media/common/tuners 12 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 12 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 13 13 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 14 14
+1 -1
drivers/media/video/pvrusb2/Makefile
··· 18 18 19 19 ccflags-y += -Idrivers/media/video 20 20 ccflags-y += -Idrivers/media/common/tuners 21 - ccflags-y += -Idrivers/media/dvb/dvb-core 21 + ccflags-y += -Idrivers/media/dvb-core 22 22 ccflags-y += -Idrivers/media/dvb/frontends
+1 -1
drivers/media/video/saa7134/Makefile
··· 12 12 13 13 ccflags-y += -I$(srctree)/drivers/media/video 14 14 ccflags-y += -I$(srctree)/drivers/media/common/tuners 15 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 15 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 16 16 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+1 -1
drivers/media/video/saa7164/Makefile
··· 6 6 7 7 ccflags-y += -I$(srctree)/drivers/media/video 8 8 ccflags-y += -I$(srctree)/drivers/media/common/tuners 9 - ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core 9 + ccflags-y += -I$(srctree)/drivers/media/dvb-core 10 10 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends 11 11 12 12 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+1 -1
drivers/media/video/tlg2300/Makefile
··· 4 4 5 5 ccflags-y += -Idrivers/media/video 6 6 ccflags-y += -Idrivers/media/common/tuners 7 - ccflags-y += -Idrivers/media/dvb/dvb-core 7 + ccflags-y += -Idrivers/media/dvb-core 8 8 ccflags-y += -Idrivers/media/dvb/frontends 9 9
+1 -1
drivers/media/video/tm6000/Makefile
··· 11 11 12 12 ccflags-y := -Idrivers/media/video 13 13 ccflags-y += -Idrivers/media/common/tuners 14 - ccflags-y += -Idrivers/media/dvb/dvb-core 14 + ccflags-y += -Idrivers/media/dvb-core 15 15 ccflags-y += -Idrivers/media/dvb/frontends
+1 -1
drivers/staging/media/as102/Makefile
··· 3 3 4 4 obj-$(CONFIG_DVB_AS102) += dvb-as102.o 5 5 6 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 6 + EXTRA_CFLAGS += -Idrivers/media/dvb-core
+1 -1
drivers/staging/media/cxd2099/Makefile
··· 1 1 obj-$(CONFIG_DVB_CXD2099) += cxd2099.o 2 2 3 - ccflags-y += -Idrivers/media/dvb/dvb-core/ 3 + ccflags-y += -Idrivers/media/dvb-core/ 4 4 ccflags-y += -Idrivers/media/dvb/frontends/ 5 5 ccflags-y += -Idrivers/media/common/tuners/
+1 -1
drivers/staging/media/go7007/Makefile
··· 27 27 ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb 28 28 29 29 ccflags-y += -Idrivers/media/dvb/frontends 30 - ccflags-y += -Idrivers/media/dvb/dvb-core 30 + ccflags-y += -Idrivers/media/dvb-core