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

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

Mauro Carvalho Chehab 786baecf 616300bd

+29 -17
+1 -1
Documentation/dvb/README.dvb-usb
··· 30 30 is done via callbacks, assigned in a static device-description (struct 31 31 dvb_usb_device) each device-driver has to have. 32 32 33 - For an example have a look in drivers/media/dvb/dvb-usb/vp7045*. 33 + For an example have a look in drivers/media/usb/dvb-usb/vp7045*. 34 34 35 35 Objective is to migrate all the usb-devices (dibusb, cinergyT2, maybe the 36 36 ttusb; flexcop-usb already benefits from the generic flexcop-device) to use
+1
drivers/media/Kconfig
··· 163 163 164 164 source "drivers/media/dvb-core/Kconfig" 165 165 source "drivers/media/dvb/Kconfig" 166 + source "drivers/media/usb/Kconfig" 166 167 167 168 comment "Supported FireWire (IEEE 1394) Adapters" 168 169 depends on DVB_CORE && FIREWIRE
+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-core/ dvb/ dvb-frontends/ 14 + obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/ usb/ 15 15 obj-$(CONFIG_DVB_FIREDTV) += firewire/
-8
drivers/media/dvb/Kconfig
··· 15 15 depends on DVB_CORE && PCI && I2C 16 16 source "drivers/media/dvb/ttpci/Kconfig" 17 17 18 - comment "Supported USB Adapters" 19 - depends on DVB_CORE && USB && I2C 20 - source "drivers/media/dvb/dvb-usb/Kconfig" 21 - source "drivers/media/dvb/dvb-usb-v2/Kconfig" 22 - source "drivers/media/dvb/ttusb-budget/Kconfig" 23 - source "drivers/media/dvb/ttusb-dec/Kconfig" 24 - source "drivers/media/dvb/siano/Kconfig" 25 - 26 18 comment "Supported FlexCopII (B2C2) Adapters" 27 19 depends on DVB_CORE && (PCI || USB) && I2C 28 20 source "drivers/media/dvb/b2c2/Kconfig"
-5
drivers/media/dvb/Makefile
··· 3 3 # 4 4 5 5 obj-y := ttpci/ \ 6 - ttusb-dec/ \ 7 - ttusb-budget/ \ 8 6 b2c2/ \ 9 7 bt8xx/ \ 10 - dvb-usb/ \ 11 - dvb-usb-v2/ \ 12 8 pluto2/ \ 13 - siano/ \ 14 9 dm1105/ \ 15 10 pt1/ \ 16 11 mantis/ \
drivers/media/dvb/dvb-usb-v2/Kconfig drivers/media/usb/dvb-usb-v2/Kconfig
drivers/media/dvb/dvb-usb-v2/Makefile drivers/media/usb/dvb-usb-v2/Makefile
drivers/media/dvb/dvb-usb-v2/af9015.c drivers/media/usb/dvb-usb-v2/af9015.c
drivers/media/dvb/dvb-usb-v2/af9015.h drivers/media/usb/dvb-usb-v2/af9015.h
drivers/media/dvb/dvb-usb-v2/af9035.c drivers/media/usb/dvb-usb-v2/af9035.c
drivers/media/dvb/dvb-usb-v2/af9035.h drivers/media/usb/dvb-usb-v2/af9035.h
drivers/media/dvb/dvb-usb-v2/anysee.c drivers/media/usb/dvb-usb-v2/anysee.c
drivers/media/dvb/dvb-usb-v2/anysee.h drivers/media/usb/dvb-usb-v2/anysee.h
drivers/media/dvb/dvb-usb-v2/au6610.c drivers/media/usb/dvb-usb-v2/au6610.c
drivers/media/dvb/dvb-usb-v2/au6610.h drivers/media/usb/dvb-usb-v2/au6610.h
drivers/media/dvb/dvb-usb-v2/az6007.c drivers/media/usb/dvb-usb-v2/az6007.c
drivers/media/dvb/dvb-usb-v2/ce6230.c drivers/media/usb/dvb-usb-v2/ce6230.c
drivers/media/dvb/dvb-usb-v2/ce6230.h drivers/media/usb/dvb-usb-v2/ce6230.h
drivers/media/dvb/dvb-usb-v2/cypress_firmware.c drivers/media/usb/dvb-usb-v2/cypress_firmware.c
drivers/media/dvb/dvb-usb-v2/cypress_firmware.h drivers/media/usb/dvb-usb-v2/cypress_firmware.h
drivers/media/dvb/dvb-usb-v2/dvb_usb.h drivers/media/usb/dvb-usb-v2/dvb_usb.h
drivers/media/dvb/dvb-usb-v2/dvb_usb_common.h drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
drivers/media/dvb/dvb-usb-v2/dvb_usb_core.c drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
drivers/media/dvb/dvb-usb-v2/dvb_usb_urb.c drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
drivers/media/dvb/dvb-usb-v2/ec168.c drivers/media/usb/dvb-usb-v2/ec168.c
drivers/media/dvb/dvb-usb-v2/ec168.h drivers/media/usb/dvb-usb-v2/ec168.h
drivers/media/dvb/dvb-usb-v2/gl861.c drivers/media/usb/dvb-usb-v2/gl861.c
drivers/media/dvb/dvb-usb-v2/gl861.h drivers/media/usb/dvb-usb-v2/gl861.h
drivers/media/dvb/dvb-usb-v2/it913x.c drivers/media/usb/dvb-usb-v2/it913x.c
drivers/media/dvb/dvb-usb-v2/lmedm04.c drivers/media/usb/dvb-usb-v2/lmedm04.c
drivers/media/dvb/dvb-usb-v2/lmedm04.h drivers/media/usb/dvb-usb-v2/lmedm04.h
drivers/media/dvb/dvb-usb-v2/mxl111sf-demod.c drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
drivers/media/dvb/dvb-usb-v2/mxl111sf-demod.h drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h
drivers/media/dvb/dvb-usb-v2/mxl111sf-gpio.c drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c
drivers/media/dvb/dvb-usb-v2/mxl111sf-gpio.h drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h
drivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.c drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c
drivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.h drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h
drivers/media/dvb/dvb-usb-v2/mxl111sf-phy.c drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c
drivers/media/dvb/dvb-usb-v2/mxl111sf-phy.h drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h
drivers/media/dvb/dvb-usb-v2/mxl111sf-reg.h drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h
drivers/media/dvb/dvb-usb-v2/mxl111sf-tuner.c drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
drivers/media/dvb/dvb-usb-v2/mxl111sf-tuner.h drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
drivers/media/dvb/dvb-usb-v2/mxl111sf.c drivers/media/usb/dvb-usb-v2/mxl111sf.c
drivers/media/dvb/dvb-usb-v2/mxl111sf.h drivers/media/usb/dvb-usb-v2/mxl111sf.h
drivers/media/dvb/dvb-usb-v2/rtl28xxu.c drivers/media/usb/dvb-usb-v2/rtl28xxu.c
drivers/media/dvb/dvb-usb-v2/rtl28xxu.h drivers/media/usb/dvb-usb-v2/rtl28xxu.h
drivers/media/dvb/dvb-usb-v2/usb_urb.c drivers/media/usb/dvb-usb-v2/usb_urb.c
drivers/media/dvb/dvb-usb/Kconfig drivers/media/usb/dvb-usb/Kconfig
drivers/media/dvb/dvb-usb/Makefile drivers/media/usb/dvb-usb/Makefile
drivers/media/dvb/dvb-usb/a800.c drivers/media/usb/dvb-usb/a800.c
drivers/media/dvb/dvb-usb/af9005-fe.c drivers/media/usb/dvb-usb/af9005-fe.c
drivers/media/dvb/dvb-usb/af9005-remote.c drivers/media/usb/dvb-usb/af9005-remote.c
drivers/media/dvb/dvb-usb/af9005-script.h drivers/media/usb/dvb-usb/af9005-script.h
drivers/media/dvb/dvb-usb/af9005.c drivers/media/usb/dvb-usb/af9005.c
drivers/media/dvb/dvb-usb/af9005.h drivers/media/usb/dvb-usb/af9005.h
drivers/media/dvb/dvb-usb/az6027.c drivers/media/usb/dvb-usb/az6027.c
drivers/media/dvb/dvb-usb/az6027.h drivers/media/usb/dvb-usb/az6027.h
drivers/media/dvb/dvb-usb/cinergyT2-core.c drivers/media/usb/dvb-usb/cinergyT2-core.c
drivers/media/dvb/dvb-usb/cinergyT2-fe.c drivers/media/usb/dvb-usb/cinergyT2-fe.c
drivers/media/dvb/dvb-usb/cinergyT2.h drivers/media/usb/dvb-usb/cinergyT2.h
drivers/media/dvb/dvb-usb/cxusb.c drivers/media/usb/dvb-usb/cxusb.c
drivers/media/dvb/dvb-usb/cxusb.h drivers/media/usb/dvb-usb/cxusb.h
drivers/media/dvb/dvb-usb/dib0700.h drivers/media/usb/dvb-usb/dib0700.h
drivers/media/dvb/dvb-usb/dib0700_core.c drivers/media/usb/dvb-usb/dib0700_core.c
drivers/media/dvb/dvb-usb/dib0700_devices.c drivers/media/usb/dvb-usb/dib0700_devices.c
drivers/media/dvb/dvb-usb/dib07x0.h drivers/media/usb/dvb-usb/dib07x0.h
drivers/media/dvb/dvb-usb/dibusb-common.c drivers/media/usb/dvb-usb/dibusb-common.c
drivers/media/dvb/dvb-usb/dibusb-mb.c drivers/media/usb/dvb-usb/dibusb-mb.c
drivers/media/dvb/dvb-usb/dibusb-mc.c drivers/media/usb/dvb-usb/dibusb-mc.c
drivers/media/dvb/dvb-usb/dibusb.h drivers/media/usb/dvb-usb/dibusb.h
drivers/media/dvb/dvb-usb/digitv.c drivers/media/usb/dvb-usb/digitv.c
drivers/media/dvb/dvb-usb/digitv.h drivers/media/usb/dvb-usb/digitv.h
drivers/media/dvb/dvb-usb/dtt200u-fe.c drivers/media/usb/dvb-usb/dtt200u-fe.c
drivers/media/dvb/dvb-usb/dtt200u.c drivers/media/usb/dvb-usb/dtt200u.c
drivers/media/dvb/dvb-usb/dtt200u.h drivers/media/usb/dvb-usb/dtt200u.h
drivers/media/dvb/dvb-usb/dtv5100.c drivers/media/usb/dvb-usb/dtv5100.c
drivers/media/dvb/dvb-usb/dtv5100.h drivers/media/usb/dvb-usb/dtv5100.h
drivers/media/dvb/dvb-usb/dvb-usb-common.h drivers/media/usb/dvb-usb/dvb-usb-common.h
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c drivers/media/usb/dvb-usb/dvb-usb-dvb.c
drivers/media/dvb/dvb-usb/dvb-usb-firmware.c drivers/media/usb/dvb-usb/dvb-usb-firmware.c
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c drivers/media/usb/dvb-usb/dvb-usb-i2c.c
drivers/media/dvb/dvb-usb/dvb-usb-init.c drivers/media/usb/dvb-usb/dvb-usb-init.c
drivers/media/dvb/dvb-usb/dvb-usb-remote.c drivers/media/usb/dvb-usb/dvb-usb-remote.c
drivers/media/dvb/dvb-usb/dvb-usb-urb.c drivers/media/usb/dvb-usb/dvb-usb-urb.c
drivers/media/dvb/dvb-usb/dvb-usb.h drivers/media/usb/dvb-usb/dvb-usb.h
drivers/media/dvb/dvb-usb/dvb_usb_dvb.c drivers/media/usb/dvb-usb/dvb_usb_dvb.c
drivers/media/dvb/dvb-usb/dvb_usb_remote.c drivers/media/usb/dvb-usb/dvb_usb_remote.c
drivers/media/dvb/dvb-usb/dw2102.c drivers/media/usb/dvb-usb/dw2102.c
drivers/media/dvb/dvb-usb/dw2102.h drivers/media/usb/dvb-usb/dw2102.h
drivers/media/dvb/dvb-usb/friio-fe.c drivers/media/usb/dvb-usb/friio-fe.c
drivers/media/dvb/dvb-usb/friio.c drivers/media/usb/dvb-usb/friio.c
drivers/media/dvb/dvb-usb/friio.h drivers/media/usb/dvb-usb/friio.h
drivers/media/dvb/dvb-usb/gp8psk-fe.c drivers/media/usb/dvb-usb/gp8psk-fe.c
drivers/media/dvb/dvb-usb/gp8psk.c drivers/media/usb/dvb-usb/gp8psk.c
drivers/media/dvb/dvb-usb/gp8psk.h drivers/media/usb/dvb-usb/gp8psk.h
drivers/media/dvb/dvb-usb/m920x.c drivers/media/usb/dvb-usb/m920x.c
drivers/media/dvb/dvb-usb/m920x.h drivers/media/usb/dvb-usb/m920x.h
drivers/media/dvb/dvb-usb/nova-t-usb2.c drivers/media/usb/dvb-usb/nova-t-usb2.c
drivers/media/dvb/dvb-usb/opera1.c drivers/media/usb/dvb-usb/opera1.c
drivers/media/dvb/dvb-usb/pctv452e.c drivers/media/usb/dvb-usb/pctv452e.c
drivers/media/dvb/dvb-usb/technisat-usb2.c drivers/media/usb/dvb-usb/technisat-usb2.c
drivers/media/dvb/dvb-usb/ttusb2.c drivers/media/usb/dvb-usb/ttusb2.c
drivers/media/dvb/dvb-usb/ttusb2.h drivers/media/usb/dvb-usb/ttusb2.h
drivers/media/dvb/dvb-usb/umt-010.c drivers/media/usb/dvb-usb/umt-010.c
drivers/media/dvb/dvb-usb/usb-urb.c drivers/media/usb/dvb-usb/usb-urb.c
drivers/media/dvb/dvb-usb/vp702x-fe.c drivers/media/usb/dvb-usb/vp702x-fe.c
drivers/media/dvb/dvb-usb/vp702x.c drivers/media/usb/dvb-usb/vp702x.c
drivers/media/dvb/dvb-usb/vp702x.h drivers/media/usb/dvb-usb/vp702x.h
drivers/media/dvb/dvb-usb/vp7045-fe.c drivers/media/usb/dvb-usb/vp7045-fe.c
drivers/media/dvb/dvb-usb/vp7045.c drivers/media/usb/dvb-usb/vp7045.c
drivers/media/dvb/dvb-usb/vp7045.h drivers/media/usb/dvb-usb/vp7045.h
drivers/media/dvb/siano/Kconfig drivers/media/usb/siano/Kconfig
drivers/media/dvb/siano/Makefile drivers/media/usb/siano/Makefile
drivers/media/dvb/siano/sms-cards.c drivers/media/usb/siano/sms-cards.c
drivers/media/dvb/siano/sms-cards.h drivers/media/usb/siano/sms-cards.h
drivers/media/dvb/siano/smscoreapi.c drivers/media/usb/siano/smscoreapi.c
drivers/media/dvb/siano/smscoreapi.h drivers/media/usb/siano/smscoreapi.h
drivers/media/dvb/siano/smsdvb.c drivers/media/usb/siano/smsdvb.c
drivers/media/dvb/siano/smsendian.c drivers/media/usb/siano/smsendian.c
drivers/media/dvb/siano/smsendian.h drivers/media/usb/siano/smsendian.h
drivers/media/dvb/siano/smsir.c drivers/media/usb/siano/smsir.c
drivers/media/dvb/siano/smsir.h drivers/media/usb/siano/smsir.h
drivers/media/dvb/siano/smssdio.c drivers/media/usb/siano/smssdio.c
drivers/media/dvb/siano/smsusb.c drivers/media/usb/siano/smsusb.c
drivers/media/dvb/ttusb-budget/Kconfig drivers/media/usb/ttusb-budget/Kconfig
drivers/media/dvb/ttusb-budget/Makefile drivers/media/usb/ttusb-budget/Makefile
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
drivers/media/dvb/ttusb-dec/Kconfig drivers/media/usb/ttusb-dec/Kconfig
drivers/media/dvb/ttusb-dec/Makefile drivers/media/usb/ttusb-dec/Makefile
drivers/media/dvb/ttusb-dec/ttusb_dec.c drivers/media/usb/ttusb-dec/ttusb_dec.c
drivers/media/dvb/ttusb-dec/ttusbdecfe.c drivers/media/usb/ttusb-dec/ttusbdecfe.c
drivers/media/dvb/ttusb-dec/ttusbdecfe.h drivers/media/usb/ttusb-dec/ttusbdecfe.h
+18
drivers/media/usb/Kconfig
··· 1 + # 2 + # USB media device configuration 3 + # 4 + 5 + menuconfig MEDIA_USB_DRIVERS 6 + bool "Supported DVB USB Adapters" 7 + depends on USB 8 + default y 9 + 10 + if MEDIA_USB_DRIVERS && DVB_CORE && I2C 11 + 12 + source "drivers/media/usb/dvb-usb/Kconfig" 13 + source "drivers/media/usb/dvb-usb-v2/Kconfig" 14 + source "drivers/media/usb/ttusb-budget/Kconfig" 15 + source "drivers/media/usb/ttusb-dec/Kconfig" 16 + source "drivers/media/usb/siano/Kconfig" 17 + 18 + endif
+6
drivers/media/usb/Makefile
··· 1 + # 2 + # Makefile for the USB media device drivers 3 + # 4 + 5 + # DVB USB-only drivers 6 + obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/
+1 -1
drivers/media/video/cx231xx/Makefile
··· 12 12 ccflags-y += -Idrivers/media/common/tuners 13 13 ccflags-y += -Idrivers/media/dvb-core 14 14 ccflags-y += -Idrivers/media/dvb-frontends 15 - ccflags-y += -Idrivers/media/dvb/dvb-usb 15 + ccflags-y += -Idrivers/media/usb/dvb-usb
+1 -1
drivers/staging/media/go7007/Makefile
··· 24 24 #ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3 25 25 26 26 # S2250 needs cypress ezusb loader from dvb-usb 27 - ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb 27 + ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/usb/dvb-usb 28 28 29 29 ccflags-y += -Idrivers/media/dvb-frontends 30 30 ccflags-y += -Idrivers/media/dvb-core