[media] common: move media/common/tuners to media/tuners
Move the tuners one level up, as the "common" directory will be used by drivers that are shared between more than one driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
3785bc170f
commit
ccae7af2bf
101 changed files with 32 additions and 32 deletions
|
@ -2773,8 +2773,8 @@ FC0011 TUNER DRIVER
|
|||
M: Michael Buesch <m@bues.ch>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/media/common/tuners/fc0011.h
|
||||
F: drivers/media/common/tuners/fc0011.c
|
||||
F: drivers/media/tuners/fc0011.h
|
||||
F: drivers/media/tuners/fc0011.c
|
||||
|
||||
FANOTIFY
|
||||
M: Eric Paris <eparis@redhat.com>
|
||||
|
|
|
@ -145,7 +145,7 @@ source "drivers/media/rc/Kconfig"
|
|||
# Tuner drivers for DVB and V4L
|
||||
#
|
||||
|
||||
source "drivers/media/common/tuners/Kconfig"
|
||||
source "drivers/media/tuners/Kconfig"
|
||||
|
||||
#
|
||||
# Video/Radio/Hybrid adapters
|
||||
|
|
|
@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
|
|||
obj-$(CONFIG_MEDIA_SUPPORT) += media.o
|
||||
endif
|
||||
|
||||
obj-y += v4l2-core/ common/ rc/ video/
|
||||
obj-y += v4l2-core/ tuners/ common/ rc/ video/
|
||||
|
||||
obj-$(CONFIG_VIDEO_DEV) += radio/
|
||||
obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
saa7146-objs := saa7146_i2c.o saa7146_core.o
|
||||
saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
|
||||
|
||||
obj-y += tuners/ b2c2/
|
||||
obj-y += b2c2/
|
||||
obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
|
||||
obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
|
||||
|
|
|
@ -4,4 +4,4 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
|
|||
|
||||
ccflags-y += -Idrivers/media/dvb-core/
|
||||
ccflags-y += -Idrivers/media/dvb-frontends/
|
||||
ccflags-y += -Idrivers/media/common/tuners/
|
||||
ccflags-y += -Idrivers/media/tuners/
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-core/
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners/
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners/
|
||||
|
||||
stb0899-objs = stb0899_drv.o stb0899_algo.o
|
||||
stv0900-objs = stv0900_core.o stv0900_sw.o
|
||||
|
|
|
@ -3,4 +3,4 @@ obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
|
|||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
ccflags-y += -Idrivers/media/video/bt8xx
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
|
|
|
@ -8,7 +8,7 @@ obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
|
|||
|
||||
ccflags-y += -Idrivers/media/dvb-core/
|
||||
ccflags-y += -Idrivers/media/dvb-frontends/
|
||||
ccflags-y += -Idrivers/media/common/tuners/
|
||||
ccflags-y += -Idrivers/media/tuners/
|
||||
|
||||
# For the staging CI driver cxd2099
|
||||
ccflags-y += -Idrivers/staging/media/cxd2099/
|
||||
|
|
|
@ -8,7 +8,7 @@ obj-$(CONFIG_DVB_NGENE) += ngene.o
|
|||
|
||||
ccflags-y += -Idrivers/media/dvb-core/
|
||||
ccflags-y += -Idrivers/media/dvb-frontends/
|
||||
ccflags-y += -Idrivers/media/common/tuners/
|
||||
ccflags-y += -Idrivers/media/tuners/
|
||||
|
||||
# For the staging CI driver cxd2099
|
||||
ccflags-y += -Idrivers/staging/media/cxd2099/
|
||||
|
|
|
@ -18,4 +18,4 @@ obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
|
|||
obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
|
||||
|
||||
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
|
|
|
@ -3,5 +3,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
|
|||
|
||||
ccflags-y += -Idrivers/media/dvb-core/
|
||||
ccflags-y += -Idrivers/media/dvb-frontends/
|
||||
ccflags-y += -Idrivers/media/common/tuners/
|
||||
ccflags-y += -Idrivers/media/tuners/
|
||||
ccflags-y += -Idrivers/media/common/b2c2/
|
||||
|
|
|
@ -44,5 +44,5 @@ obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
|
|||
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||
|
||||
|
|
|
@ -78,5 +78,5 @@ obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o
|
|||
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends/
|
||||
# due to tuner-xc3028
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/pci/ttpci
|
||||
|
|
|
@ -31,5 +31,5 @@ obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
|
|||
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||
|
||||
|
|
|
@ -192,4 +192,4 @@ obj-$(CONFIG_ARCH_OMAP) += omap/
|
|||
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||
|
|
|
@ -2,7 +2,7 @@ au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-vid
|
|||
|
||||
obj-$(CONFIG_VIDEO_AU0828) += au0828.o
|
||||
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
||||
|
|
|
@ -9,5 +9,5 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \
|
|||
obj-$(CONFIG_VIDEO_BT848) += bttv.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
|
|
|
@ -10,4 +10,4 @@ obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
|
|||
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
|
|
|
@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o
|
|||
obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
ccflags-y += -Idrivers/media/usb/dvb-usb
|
||||
|
|
|
@ -8,7 +8,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
|
|||
obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
||||
|
|
|
@ -8,6 +8,6 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
|
|||
obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
|
||||
|
||||
ccflags-y := -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
|
|
@ -11,6 +11,6 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
|
|||
obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
|
|
@ -10,6 +10,6 @@ obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o
|
|||
obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
|
|
@ -8,7 +8,7 @@ obj-$(CONFIG_VIDEO_IVTV) += ivtv.o
|
|||
obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o
|
||||
|
||||
ccflags-y += -I$(srctree)/drivers/media/video
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
||||
|
||||
|
|
|
@ -17,6 +17,6 @@ pvrusb2-objs := pvrusb2-i2c-core.o \
|
|||
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
|
|
@ -11,6 +11,6 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
|
|||
obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
|
||||
|
||||
ccflags-y += -I$(srctree)/drivers/media/video
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
||||
|
|
|
@ -5,7 +5,7 @@ saa7164-objs := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \
|
|||
obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o
|
||||
|
||||
ccflags-y += -I$(srctree)/drivers/media/video
|
||||
ccflags-y += -I$(srctree)/drivers/media/common/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/tuners
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
||||
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ poseidon-objs := pd-video.o pd-alsa.o pd-dvb.o pd-radio.o pd-main.o
|
|||
obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
||||
|
|
|
@ -10,6 +10,6 @@ obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
|
|||
obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
|
||||
|
||||
ccflags-y := -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
ccflags-y += -Idrivers/media/dvb-core
|
||||
ccflags-y += -Idrivers/media/dvb-frontends
|
||||
|
|
|
@ -3,4 +3,4 @@ usbvision-objs := usbvision-core.o usbvision-video.o usbvision-i2c.o usbvision-
|
|||
obj-$(CONFIG_VIDEO_USBVISION) += usbvision.o
|
||||
|
||||
ccflags-y += -Idrivers/media/video
|
||||
ccflags-y += -Idrivers/media/common/tuners
|
||||
ccflags-y += -Idrivers/media/tuners
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue