[media] dvb-usb: move it to drivers/media/usb/dvb-usb

As media/dvb will be removed, move it to a proper place.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-06-14 16:35:56 -03:00
parent 616300bd51
commit 786baecfe7
136 changed files with 29 additions and 17 deletions

View File

@ -30,7 +30,7 @@ with the device via the bus. The connection between the DVB-API-functionality
is done via callbacks, assigned in a static device-description (struct
dvb_usb_device) each device-driver has to have.
For an example have a look in drivers/media/dvb/dvb-usb/vp7045*.
For an example have a look in drivers/media/usb/dvb-usb/vp7045*.
Objective is to migrate all the usb-devices (dibusb, cinergyT2, maybe the
ttusb; flexcop-usb already benefits from the generic flexcop-device) to use

View File

@ -163,6 +163,7 @@ source "drivers/media/radio/Kconfig"
source "drivers/media/dvb-core/Kconfig"
source "drivers/media/dvb/Kconfig"
source "drivers/media/usb/Kconfig"
comment "Supported FireWire (IEEE 1394) Adapters"
depends on DVB_CORE && FIREWIRE

View File

@ -11,5 +11,5 @@ endif
obj-y += v4l2-core/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/
obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/ usb/
obj-$(CONFIG_DVB_FIREDTV) += firewire/

View File

@ -15,14 +15,6 @@ comment "Supported SAA7146 based PCI Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/ttpci/Kconfig"
comment "Supported USB Adapters"
depends on DVB_CORE && USB && I2C
source "drivers/media/dvb/dvb-usb/Kconfig"
source "drivers/media/dvb/dvb-usb-v2/Kconfig"
source "drivers/media/dvb/ttusb-budget/Kconfig"
source "drivers/media/dvb/ttusb-dec/Kconfig"
source "drivers/media/dvb/siano/Kconfig"
comment "Supported FlexCopII (B2C2) Adapters"
depends on DVB_CORE && (PCI || USB) && I2C
source "drivers/media/dvb/b2c2/Kconfig"

View File

@ -3,14 +3,9 @@
#
obj-y := ttpci/ \
ttusb-dec/ \
ttusb-budget/ \
b2c2/ \
bt8xx/ \
dvb-usb/ \
dvb-usb-v2/ \
pluto2/ \
siano/ \
dm1105/ \
pt1/ \
mantis/ \

18
drivers/media/usb/Kconfig Normal file
View File

@ -0,0 +1,18 @@
#
# USB media device configuration
#
menuconfig MEDIA_USB_DRIVERS
bool "Supported DVB USB Adapters"
depends on USB
default y
if MEDIA_USB_DRIVERS && DVB_CORE && I2C
source "drivers/media/usb/dvb-usb/Kconfig"
source "drivers/media/usb/dvb-usb-v2/Kconfig"
source "drivers/media/usb/ttusb-budget/Kconfig"
source "drivers/media/usb/ttusb-dec/Kconfig"
source "drivers/media/usb/siano/Kconfig"
endif

View File

@ -0,0 +1,6 @@
#
# Makefile for the USB media device drivers
#
# DVB USB-only drivers
obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/

Some files were not shown because too many files have changed in this diff Show More