leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] common: move media/common/tuners to media/tuners

Browse Source 
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:
Mauro Carvalho Chehab 2012-06-14 16:35:59 -03:00
parent 3785bc170f
commit ccae7af2bf
101 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -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>

2
drivers/media/Kconfig
View File

@ -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

2
drivers/media/Makefile
View File

@ -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/

2
drivers/media/common/Makefile
View File

@ -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

2
drivers/media/common/b2c2/Makefile
View File

@ -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/

2
drivers/media/dvb-frontends/Makefile
View File

@ -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

2
drivers/media/pci/bt8xx/Makefile
View File

@ -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

2
drivers/media/pci/ddbridge/Makefile
View File

@ -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/

2
drivers/media/pci/ngene/Makefile
View File

@ -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/

2
drivers/media/pci/ttpci/Makefile
View File

@ -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

0
drivers/media/common/tuners/Kconfig → drivers/media/tuners/Kconfig
View File

0
drivers/media/common/tuners/Makefile → drivers/media/tuners/Makefile
View File

0
drivers/media/common/tuners/fc0011.c → drivers/media/tuners/fc0011.c
View File

0
drivers/media/common/tuners/fc0011.h → drivers/media/tuners/fc0011.h
View File

0
drivers/media/common/tuners/fc0012-priv.h → drivers/media/tuners/fc0012-priv.h
View File

0
drivers/media/common/tuners/fc0012.c → drivers/media/tuners/fc0012.c
View File

0
drivers/media/common/tuners/fc0012.h → drivers/media/tuners/fc0012.h
View File

0
drivers/media/common/tuners/fc0013-priv.h → drivers/media/tuners/fc0013-priv.h
View File

0
drivers/media/common/tuners/fc0013.c → drivers/media/tuners/fc0013.c
View File

0
drivers/media/common/tuners/fc0013.h → drivers/media/tuners/fc0013.h
View File

0
drivers/media/common/tuners/fc001x-common.h → drivers/media/tuners/fc001x-common.h
View File

0
drivers/media/common/tuners/max2165.c → drivers/media/tuners/max2165.c
View File

0
drivers/media/common/tuners/max2165.h → drivers/media/tuners/max2165.h
View File

0
drivers/media/common/tuners/max2165_priv.h → drivers/media/tuners/max2165_priv.h
View File

0
drivers/media/common/tuners/mc44s803.c → drivers/media/tuners/mc44s803.c
View File

0
drivers/media/common/tuners/mc44s803.h → drivers/media/tuners/mc44s803.h
View File

0
drivers/media/common/tuners/mc44s803_priv.h → drivers/media/tuners/mc44s803_priv.h
View File

0
drivers/media/common/tuners/mt2060.c → drivers/media/tuners/mt2060.c
View File

0
drivers/media/common/tuners/mt2060.h → drivers/media/tuners/mt2060.h
View File

0
drivers/media/common/tuners/mt2060_priv.h → drivers/media/tuners/mt2060_priv.h
View File

0
drivers/media/common/tuners/mt2063.c → drivers/media/tuners/mt2063.c
View File

0
drivers/media/common/tuners/mt2063.h → drivers/media/tuners/mt2063.h
View File

0
drivers/media/common/tuners/mt20xx.c → drivers/media/tuners/mt20xx.c
View File

0
drivers/media/common/tuners/mt20xx.h → drivers/media/tuners/mt20xx.h
View File

0
drivers/media/common/tuners/mt2131.c → drivers/media/tuners/mt2131.c
View File

0
drivers/media/common/tuners/mt2131.h → drivers/media/tuners/mt2131.h
View File

0
drivers/media/common/tuners/mt2131_priv.h → drivers/media/tuners/mt2131_priv.h
View File

0
drivers/media/common/tuners/mt2266.c → drivers/media/tuners/mt2266.c
View File

0
drivers/media/common/tuners/mt2266.h → drivers/media/tuners/mt2266.h
View File

0
drivers/media/common/tuners/mxl5005s.c → drivers/media/tuners/mxl5005s.c
View File

0
drivers/media/common/tuners/mxl5005s.h → drivers/media/tuners/mxl5005s.h
View File

0
drivers/media/common/tuners/mxl5007t.c → drivers/media/tuners/mxl5007t.c
View File

0
drivers/media/common/tuners/mxl5007t.h → drivers/media/tuners/mxl5007t.h
View File

0
drivers/media/common/tuners/qt1010.c → drivers/media/tuners/qt1010.c
View File

0
drivers/media/common/tuners/qt1010.h → drivers/media/tuners/qt1010.h
View File

0
drivers/media/common/tuners/qt1010_priv.h → drivers/media/tuners/qt1010_priv.h
View File

0
drivers/media/common/tuners/tda18212.c → drivers/media/tuners/tda18212.c
View File

0
drivers/media/common/tuners/tda18212.h → drivers/media/tuners/tda18212.h
View File

0
drivers/media/common/tuners/tda18218.c → drivers/media/tuners/tda18218.c
View File

0
drivers/media/common/tuners/tda18218.h → drivers/media/tuners/tda18218.h
View File

0
drivers/media/common/tuners/tda18218_priv.h → drivers/media/tuners/tda18218_priv.h
View File

0
drivers/media/common/tuners/tda18271-common.c → drivers/media/tuners/tda18271-common.c
View File

0
drivers/media/common/tuners/tda18271-fe.c → drivers/media/tuners/tda18271-fe.c
View File

0
drivers/media/common/tuners/tda18271-maps.c → drivers/media/tuners/tda18271-maps.c
View File

0
drivers/media/common/tuners/tda18271-priv.h → drivers/media/tuners/tda18271-priv.h
View File

0
drivers/media/common/tuners/tda18271.h → drivers/media/tuners/tda18271.h
View File

0
drivers/media/common/tuners/tda827x.c → drivers/media/tuners/tda827x.c
View File

0
drivers/media/common/tuners/tda827x.h → drivers/media/tuners/tda827x.h
View File

0
drivers/media/common/tuners/tda8290.c → drivers/media/tuners/tda8290.c
View File

0
drivers/media/common/tuners/tda8290.h → drivers/media/tuners/tda8290.h
View File

0
drivers/media/common/tuners/tda9887.c → drivers/media/tuners/tda9887.c
View File

0
drivers/media/common/tuners/tda9887.h → drivers/media/tuners/tda9887.h
View File

0
drivers/media/common/tuners/tea5761.c → drivers/media/tuners/tea5761.c
View File

0
drivers/media/common/tuners/tea5761.h → drivers/media/tuners/tea5761.h
View File

0
drivers/media/common/tuners/tea5767.c → drivers/media/tuners/tea5767.c
View File

0
drivers/media/common/tuners/tea5767.h → drivers/media/tuners/tea5767.h
View File

0
drivers/media/common/tuners/tua9001.c → drivers/media/tuners/tua9001.c
View File

0
drivers/media/common/tuners/tua9001.h → drivers/media/tuners/tua9001.h
View File

0
drivers/media/common/tuners/tua9001_priv.h → drivers/media/tuners/tua9001_priv.h
View File

0
drivers/media/common/tuners/tuner-i2c.h → drivers/media/tuners/tuner-i2c.h
View File

0
drivers/media/common/tuners/tuner-simple.c → drivers/media/tuners/tuner-simple.c
View File

0
drivers/media/common/tuners/tuner-simple.h → drivers/media/tuners/tuner-simple.h
View File

0
drivers/media/common/tuners/tuner-types.c → drivers/media/tuners/tuner-types.c
View File

0
drivers/media/common/tuners/tuner-xc2028-types.h → drivers/media/tuners/tuner-xc2028-types.h
View File

0
drivers/media/common/tuners/tuner-xc2028.c → drivers/media/tuners/tuner-xc2028.c
View File

0
drivers/media/common/tuners/tuner-xc2028.h → drivers/media/tuners/tuner-xc2028.h
View File

0
drivers/media/common/tuners/xc4000.c → drivers/media/tuners/xc4000.c
View File

0
drivers/media/common/tuners/xc4000.h → drivers/media/tuners/xc4000.h
View File

0
drivers/media/common/tuners/xc5000.c → drivers/media/tuners/xc5000.c
View File

0
drivers/media/common/tuners/xc5000.h → drivers/media/tuners/xc5000.h
View File

2
drivers/media/usb/b2c2/Makefile
View File

@ -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/

2
drivers/media/usb/dvb-usb-v2/Makefile
View File

@ -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

2
drivers/media/usb/dvb-usb/Makefile
View File

@ -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

2
drivers/media/v4l2-core/Makefile
View File

@ -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

2
drivers/media/video/Makefile
View File

@ -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
drivers/media/video/au0828/Makefile
View File

@ -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

2
drivers/media/video/bt8xx/Makefile
View File

@ -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

2
drivers/media/video/cx18/Makefile
View File

@ -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

2
drivers/media/video/cx231xx/Makefile
View File

@ -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

2
drivers/media/video/cx23885/Makefile
View File

@ -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

2
drivers/media/video/cx25821/Makefile
View File

@ -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

2
drivers/media/video/cx88/Makefile
View File

@ -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

2
drivers/media/video/em28xx/Makefile
View File

@ -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

2
drivers/media/video/ivtv/Makefile
View File

@ -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

2
drivers/media/video/pvrusb2/Makefile
View File

@ -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

2
drivers/media/video/saa7134/Makefile
View File

@ -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

2
drivers/media/video/saa7164/Makefile
View File

@ -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

2
drivers/media/video/tlg2300/Makefile
View File

@ -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

2
drivers/media/video/tm6000/Makefile
View File

@ -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

2
drivers/media/video/usbvision/Makefile
View File

@ -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