Skip to content

Commit

Permalink
[media] move the dvb/frontends to drivers/media/dvb-frontends
Browse files Browse the repository at this point in the history
Raise the DVB frontends one level up, as the intention is to remove
the drivers/media/dvb directory.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Aug 14, 2012
1 parent 3d6c2bc commit 9a0bf52
Show file tree
Hide file tree
Showing 272 changed files with 37 additions and 38 deletions.
4 changes: 4 additions & 0 deletions drivers/media/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,8 @@ source "drivers/media/radio/Kconfig"
source "drivers/media/dvb-core/Kconfig"
source "drivers/media/dvb/Kconfig"

comment "Supported DVB Frontends"
depends on DVB_CORE
source "drivers/media/dvb-frontends/Kconfig"

endif # MEDIA_SUPPORT
2 changes: 1 addition & 1 deletion drivers/media/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ endif
obj-y += v4l2-core/ common/ rc/ video/

obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/
obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/
2 changes: 1 addition & 1 deletion drivers/media/common/tuners/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o
obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o

ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions drivers/media/dvb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,4 @@ comment "Supported ddbridge ('Octopus') Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/ddbridge/Kconfig"

comment "Supported DVB Frontends"
depends on DVB_CORE
source "drivers/media/dvb/frontends/Kconfig"

endif # DVB_CAPTURE_DRIVERS
3 changes: 1 addition & 2 deletions drivers/media/dvb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#

obj-y := frontends/ \
ttpci/ \
obj-y := ttpci/ \
ttusb-dec/ \
ttusb-budget/ \
b2c2/ \
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/b2c2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
b2c2-flexcop-usb-objs = flexcop-usb.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o

ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
2 changes: 1 addition & 1 deletion drivers/media/dvb/bt8xx/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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/dvb-frontends
ccflags-y += -Idrivers/media/video/bt8xx
ccflags-y += -Idrivers/media/common/tuners
2 changes: 1 addition & 1 deletion drivers/media/dvb/ddbridge/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ddbridge-objs := ddbridge-core.o
obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o

ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/

# For the staging CI driver cxd2099
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dm1105/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_DM1105) += dm1105.o

ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb-v2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ dvb-usb-rtl28xxu-objs = rtl28xxu.o
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/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners

2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dvb-usb-technisat-usb2-objs = technisat-usb2.o
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/
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/dvb/ttpci
2 changes: 1 addition & 1 deletion drivers/media/dvb/mantis/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ obj-$(CONFIG_MANTIS_CORE) += mantis_core.o
obj-$(CONFIG_DVB_MANTIS) += mantis.o
obj-$(CONFIG_DVB_HOPPER) += hopper.o

ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
2 changes: 1 addition & 1 deletion drivers/media/dvb/ngene/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o
obj-$(CONFIG_DVB_NGENE) += ngene.o

ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/

# For the staging CI driver cxd2099
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/pluto2/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_PLUTO2) += pluto2.o

ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
2 changes: 1 addition & 1 deletion drivers/media/dvb/pt1/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ earth-pt1-objs := pt1.o va1j5jf8007s.o va1j5jf8007t.o

obj-$(CONFIG_DVB_PT1) += earth-pt1.o

ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/dvb/ttpci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-ci.o
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/dvb-core/ -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners
2 changes: 1 addition & 1 deletion drivers/media/dvb/ttusb-budget/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o

ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/v4l2-core/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
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/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners

2 changes: 1 addition & 1 deletion drivers/media/video/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -191,5 +191,5 @@ obj-y += davinci/
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/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners
2 changes: 1 addition & 1 deletion drivers/media/video/au0828/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ obj-$(CONFIG_VIDEO_AU0828) += au0828.o

ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends

ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
2 changes: 1 addition & 1 deletion drivers/media/video/cx18/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ obj-$(CONFIG_VIDEO_CX18) += cx18.o
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o

ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/common/tuners
4 changes: 2 additions & 2 deletions drivers/media/video/cx231xx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/dvb/dvb-usb
2 changes: 1 addition & 1 deletion drivers/media/video/cx23885/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends

ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
2 changes: 1 addition & 1 deletion drivers/media/video/cx25821/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/video/cx88/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/video/em28xx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/video/ivtv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ 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/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends

2 changes: 1 addition & 1 deletion drivers/media/video/pvrusb2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/video/saa7134/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ 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/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/media/video/saa7164/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ 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/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends

ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
2 changes: 1 addition & 1 deletion drivers/media/video/tlg2300/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends

2 changes: 1 addition & 1 deletion drivers/media/video/tm6000/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends
2 changes: 1 addition & 1 deletion drivers/staging/media/cxd2099/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
obj-$(CONFIG_DVB_CXD2099) += cxd2099.o

ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
2 changes: 1 addition & 1 deletion drivers/staging/media/go7007/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ s2250-y := s2250-board.o
# S2250 needs cypress ezusb loader from dvb-usb
ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb

ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/dvb-core

0 comments on commit 9a0bf52

Please sign in to comment.