[media] Rename media/dvb as media/pci
authorMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 14 Jun 2012 19:35:57 +0000 (16:35 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 14 Aug 2012 02:30:06 +0000 (23:30 -0300)
The remaining dvb drivers are pci, so rename them to match the
bus.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
126 files changed:
Documentation/DocBook/media/dvb/kdapi.xml
drivers/media/Kconfig
drivers/media/Makefile
drivers/media/pci/Kconfig [moved from drivers/media/dvb/Kconfig with 71% similarity]
drivers/media/pci/Makefile [moved from drivers/media/dvb/Makefile with 100% similarity]
drivers/media/pci/b2c2/Kconfig [moved from drivers/media/dvb/b2c2/Kconfig with 100% similarity]
drivers/media/pci/b2c2/Makefile [moved from drivers/media/dvb/b2c2/Makefile with 100% similarity]
drivers/media/pci/b2c2/flexcop-common.h [moved from drivers/media/dvb/b2c2/flexcop-common.h with 100% similarity]
drivers/media/pci/b2c2/flexcop-dma.c [moved from drivers/media/dvb/b2c2/flexcop-dma.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-eeprom.c [moved from drivers/media/dvb/b2c2/flexcop-eeprom.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-fe-tuner.c [moved from drivers/media/dvb/b2c2/flexcop-fe-tuner.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-hw-filter.c [moved from drivers/media/dvb/b2c2/flexcop-hw-filter.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-i2c.c [moved from drivers/media/dvb/b2c2/flexcop-i2c.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-misc.c [moved from drivers/media/dvb/b2c2/flexcop-misc.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-pci.c [moved from drivers/media/dvb/b2c2/flexcop-pci.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-reg.h [moved from drivers/media/dvb/b2c2/flexcop-reg.h with 100% similarity]
drivers/media/pci/b2c2/flexcop-sram.c [moved from drivers/media/dvb/b2c2/flexcop-sram.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-usb.c [moved from drivers/media/dvb/b2c2/flexcop-usb.c with 100% similarity]
drivers/media/pci/b2c2/flexcop-usb.h [moved from drivers/media/dvb/b2c2/flexcop-usb.h with 100% similarity]
drivers/media/pci/b2c2/flexcop.c [moved from drivers/media/dvb/b2c2/flexcop.c with 100% similarity]
drivers/media/pci/b2c2/flexcop.h [moved from drivers/media/dvb/b2c2/flexcop.h with 100% similarity]
drivers/media/pci/b2c2/flexcop_ibi_value_be.h [moved from drivers/media/dvb/b2c2/flexcop_ibi_value_be.h with 100% similarity]
drivers/media/pci/b2c2/flexcop_ibi_value_le.h [moved from drivers/media/dvb/b2c2/flexcop_ibi_value_le.h with 100% similarity]
drivers/media/pci/bt8xx/Kconfig [moved from drivers/media/dvb/bt8xx/Kconfig with 100% similarity]
drivers/media/pci/bt8xx/Makefile [moved from drivers/media/dvb/bt8xx/Makefile with 100% similarity]
drivers/media/pci/bt8xx/bt878.c [moved from drivers/media/dvb/bt8xx/bt878.c with 100% similarity]
drivers/media/pci/bt8xx/bt878.h [moved from drivers/media/dvb/bt8xx/bt878.h with 100% similarity]
drivers/media/pci/bt8xx/dst.c [moved from drivers/media/dvb/bt8xx/dst.c with 100% similarity]
drivers/media/pci/bt8xx/dst_ca.c [moved from drivers/media/dvb/bt8xx/dst_ca.c with 100% similarity]
drivers/media/pci/bt8xx/dst_ca.h [moved from drivers/media/dvb/bt8xx/dst_ca.h with 100% similarity]
drivers/media/pci/bt8xx/dst_common.h [moved from drivers/media/dvb/bt8xx/dst_common.h with 100% similarity]
drivers/media/pci/bt8xx/dst_priv.h [moved from drivers/media/dvb/bt8xx/dst_priv.h with 100% similarity]
drivers/media/pci/bt8xx/dvb-bt8xx.c [moved from drivers/media/dvb/bt8xx/dvb-bt8xx.c with 100% similarity]
drivers/media/pci/bt8xx/dvb-bt8xx.h [moved from drivers/media/dvb/bt8xx/dvb-bt8xx.h with 100% similarity]
drivers/media/pci/ddbridge/Kconfig [moved from drivers/media/dvb/ddbridge/Kconfig with 100% similarity]
drivers/media/pci/ddbridge/Makefile [moved from drivers/media/dvb/ddbridge/Makefile with 100% similarity]
drivers/media/pci/ddbridge/ddbridge-core.c [moved from drivers/media/dvb/ddbridge/ddbridge-core.c with 100% similarity]
drivers/media/pci/ddbridge/ddbridge-regs.h [moved from drivers/media/dvb/ddbridge/ddbridge-regs.h with 100% similarity]
drivers/media/pci/ddbridge/ddbridge.h [moved from drivers/media/dvb/ddbridge/ddbridge.h with 100% similarity]
drivers/media/pci/dm1105/Kconfig [moved from drivers/media/dvb/dm1105/Kconfig with 100% similarity]
drivers/media/pci/dm1105/Makefile [moved from drivers/media/dvb/dm1105/Makefile with 100% similarity]
drivers/media/pci/dm1105/dm1105.c [moved from drivers/media/dvb/dm1105/dm1105.c with 100% similarity]
drivers/media/pci/mantis/Kconfig [moved from drivers/media/dvb/mantis/Kconfig with 100% similarity]
drivers/media/pci/mantis/Makefile [moved from drivers/media/dvb/mantis/Makefile with 100% similarity]
drivers/media/pci/mantis/hopper_cards.c [moved from drivers/media/dvb/mantis/hopper_cards.c with 100% similarity]
drivers/media/pci/mantis/hopper_vp3028.c [moved from drivers/media/dvb/mantis/hopper_vp3028.c with 100% similarity]
drivers/media/pci/mantis/hopper_vp3028.h [moved from drivers/media/dvb/mantis/hopper_vp3028.h with 100% similarity]
drivers/media/pci/mantis/mantis_ca.c [moved from drivers/media/dvb/mantis/mantis_ca.c with 100% similarity]
drivers/media/pci/mantis/mantis_ca.h [moved from drivers/media/dvb/mantis/mantis_ca.h with 100% similarity]
drivers/media/pci/mantis/mantis_cards.c [moved from drivers/media/dvb/mantis/mantis_cards.c with 100% similarity]
drivers/media/pci/mantis/mantis_common.h [moved from drivers/media/dvb/mantis/mantis_common.h with 100% similarity]
drivers/media/pci/mantis/mantis_core.c [moved from drivers/media/dvb/mantis/mantis_core.c with 100% similarity]
drivers/media/pci/mantis/mantis_core.h [moved from drivers/media/dvb/mantis/mantis_core.h with 100% similarity]
drivers/media/pci/mantis/mantis_dma.c [moved from drivers/media/dvb/mantis/mantis_dma.c with 100% similarity]
drivers/media/pci/mantis/mantis_dma.h [moved from drivers/media/dvb/mantis/mantis_dma.h with 100% similarity]
drivers/media/pci/mantis/mantis_dvb.c [moved from drivers/media/dvb/mantis/mantis_dvb.c with 100% similarity]
drivers/media/pci/mantis/mantis_dvb.h [moved from drivers/media/dvb/mantis/mantis_dvb.h with 100% similarity]
drivers/media/pci/mantis/mantis_evm.c [moved from drivers/media/dvb/mantis/mantis_evm.c with 100% similarity]
drivers/media/pci/mantis/mantis_hif.c [moved from drivers/media/dvb/mantis/mantis_hif.c with 100% similarity]
drivers/media/pci/mantis/mantis_hif.h [moved from drivers/media/dvb/mantis/mantis_hif.h with 100% similarity]
drivers/media/pci/mantis/mantis_i2c.c [moved from drivers/media/dvb/mantis/mantis_i2c.c with 100% similarity]
drivers/media/pci/mantis/mantis_i2c.h [moved from drivers/media/dvb/mantis/mantis_i2c.h with 100% similarity]
drivers/media/pci/mantis/mantis_input.c [moved from drivers/media/dvb/mantis/mantis_input.c with 100% similarity]
drivers/media/pci/mantis/mantis_ioc.c [moved from drivers/media/dvb/mantis/mantis_ioc.c with 100% similarity]
drivers/media/pci/mantis/mantis_ioc.h [moved from drivers/media/dvb/mantis/mantis_ioc.h with 100% similarity]
drivers/media/pci/mantis/mantis_link.h [moved from drivers/media/dvb/mantis/mantis_link.h with 100% similarity]
drivers/media/pci/mantis/mantis_pci.c [moved from drivers/media/dvb/mantis/mantis_pci.c with 100% similarity]
drivers/media/pci/mantis/mantis_pci.h [moved from drivers/media/dvb/mantis/mantis_pci.h with 100% similarity]
drivers/media/pci/mantis/mantis_pcmcia.c [moved from drivers/media/dvb/mantis/mantis_pcmcia.c with 100% similarity]
drivers/media/pci/mantis/mantis_reg.h [moved from drivers/media/dvb/mantis/mantis_reg.h with 100% similarity]
drivers/media/pci/mantis/mantis_uart.c [moved from drivers/media/dvb/mantis/mantis_uart.c with 100% similarity]
drivers/media/pci/mantis/mantis_uart.h [moved from drivers/media/dvb/mantis/mantis_uart.h with 100% similarity]
drivers/media/pci/mantis/mantis_vp1033.c [moved from drivers/media/dvb/mantis/mantis_vp1033.c with 100% similarity]
drivers/media/pci/mantis/mantis_vp1033.h [moved from drivers/media/dvb/mantis/mantis_vp1033.h with 100% similarity]
drivers/media/pci/mantis/mantis_vp1034.c [moved from drivers/media/dvb/mantis/mantis_vp1034.c with 100% similarity]
drivers/media/pci/mantis/mantis_vp1034.h [moved from drivers/media/dvb/mantis/mantis_vp1034.h with 100% similarity]
drivers/media/pci/mantis/mantis_vp1041.c [moved from drivers/media/dvb/mantis/mantis_vp1041.c with 100% similarity]
drivers/media/pci/mantis/mantis_vp1041.h [moved from drivers/media/dvb/mantis/mantis_vp1041.h with 100% similarity]
drivers/media/pci/mantis/mantis_vp2033.c [moved from drivers/media/dvb/mantis/mantis_vp2033.c with 100% similarity]
drivers/media/pci/mantis/mantis_vp2033.h [moved from drivers/media/dvb/mantis/mantis_vp2033.h with 100% similarity]
drivers/media/pci/mantis/mantis_vp2040.c [moved from drivers/media/dvb/mantis/mantis_vp2040.c with 100% similarity]
drivers/media/pci/mantis/mantis_vp2040.h [moved from drivers/media/dvb/mantis/mantis_vp2040.h with 100% similarity]
drivers/media/pci/mantis/mantis_vp3028.c [moved from drivers/media/dvb/mantis/mantis_vp3028.c with 100% similarity]
drivers/media/pci/mantis/mantis_vp3028.h [moved from drivers/media/dvb/mantis/mantis_vp3028.h with 100% similarity]
drivers/media/pci/mantis/mantis_vp3030.c [moved from drivers/media/dvb/mantis/mantis_vp3030.c with 100% similarity]
drivers/media/pci/mantis/mantis_vp3030.h [moved from drivers/media/dvb/mantis/mantis_vp3030.h with 100% similarity]
drivers/media/pci/ngene/Kconfig [moved from drivers/media/dvb/ngene/Kconfig with 100% similarity]
drivers/media/pci/ngene/Makefile [moved from drivers/media/dvb/ngene/Makefile with 100% similarity]
drivers/media/pci/ngene/ngene-cards.c [moved from drivers/media/dvb/ngene/ngene-cards.c with 100% similarity]
drivers/media/pci/ngene/ngene-core.c [moved from drivers/media/dvb/ngene/ngene-core.c with 100% similarity]
drivers/media/pci/ngene/ngene-dvb.c [moved from drivers/media/dvb/ngene/ngene-dvb.c with 100% similarity]
drivers/media/pci/ngene/ngene-i2c.c [moved from drivers/media/dvb/ngene/ngene-i2c.c with 100% similarity]
drivers/media/pci/ngene/ngene.h [moved from drivers/media/dvb/ngene/ngene.h with 100% similarity]
drivers/media/pci/pluto2/Kconfig [moved from drivers/media/dvb/pluto2/Kconfig with 100% similarity]
drivers/media/pci/pluto2/Makefile [moved from drivers/media/dvb/pluto2/Makefile with 100% similarity]
drivers/media/pci/pluto2/pluto2.c [moved from drivers/media/dvb/pluto2/pluto2.c with 100% similarity]
drivers/media/pci/pt1/Kconfig [moved from drivers/media/dvb/pt1/Kconfig with 100% similarity]
drivers/media/pci/pt1/Makefile [moved from drivers/media/dvb/pt1/Makefile with 100% similarity]
drivers/media/pci/pt1/pt1.c [moved from drivers/media/dvb/pt1/pt1.c with 100% similarity]
drivers/media/pci/pt1/va1j5jf8007s.c [moved from drivers/media/dvb/pt1/va1j5jf8007s.c with 100% similarity]
drivers/media/pci/pt1/va1j5jf8007s.h [moved from drivers/media/dvb/pt1/va1j5jf8007s.h with 100% similarity]
drivers/media/pci/pt1/va1j5jf8007t.c [moved from drivers/media/dvb/pt1/va1j5jf8007t.c with 100% similarity]
drivers/media/pci/pt1/va1j5jf8007t.h [moved from drivers/media/dvb/pt1/va1j5jf8007t.h with 100% similarity]
drivers/media/pci/ttpci/Kconfig [moved from drivers/media/dvb/ttpci/Kconfig with 100% similarity]
drivers/media/pci/ttpci/Makefile [moved from drivers/media/dvb/ttpci/Makefile with 100% similarity]
drivers/media/pci/ttpci/av7110.c [moved from drivers/media/dvb/ttpci/av7110.c with 100% similarity]
drivers/media/pci/ttpci/av7110.h [moved from drivers/media/dvb/ttpci/av7110.h with 100% similarity]
drivers/media/pci/ttpci/av7110_av.c [moved from drivers/media/dvb/ttpci/av7110_av.c with 100% similarity]
drivers/media/pci/ttpci/av7110_av.h [moved from drivers/media/dvb/ttpci/av7110_av.h with 100% similarity]
drivers/media/pci/ttpci/av7110_ca.c [moved from drivers/media/dvb/ttpci/av7110_ca.c with 100% similarity]
drivers/media/pci/ttpci/av7110_ca.h [moved from drivers/media/dvb/ttpci/av7110_ca.h with 100% similarity]
drivers/media/pci/ttpci/av7110_hw.c [moved from drivers/media/dvb/ttpci/av7110_hw.c with 100% similarity]
drivers/media/pci/ttpci/av7110_hw.h [moved from drivers/media/dvb/ttpci/av7110_hw.h with 100% similarity]
drivers/media/pci/ttpci/av7110_ipack.c [moved from drivers/media/dvb/ttpci/av7110_ipack.c with 100% similarity]
drivers/media/pci/ttpci/av7110_ipack.h [moved from drivers/media/dvb/ttpci/av7110_ipack.h with 100% similarity]
drivers/media/pci/ttpci/av7110_ir.c [moved from drivers/media/dvb/ttpci/av7110_ir.c with 100% similarity]
drivers/media/pci/ttpci/av7110_v4l.c [moved from drivers/media/dvb/ttpci/av7110_v4l.c with 100% similarity]
drivers/media/pci/ttpci/budget-av.c [moved from drivers/media/dvb/ttpci/budget-av.c with 100% similarity]
drivers/media/pci/ttpci/budget-ci.c [moved from drivers/media/dvb/ttpci/budget-ci.c with 100% similarity]
drivers/media/pci/ttpci/budget-core.c [moved from drivers/media/dvb/ttpci/budget-core.c with 100% similarity]
drivers/media/pci/ttpci/budget-patch.c [moved from drivers/media/dvb/ttpci/budget-patch.c with 100% similarity]
drivers/media/pci/ttpci/budget.c [moved from drivers/media/dvb/ttpci/budget.c with 100% similarity]
drivers/media/pci/ttpci/budget.h [moved from drivers/media/dvb/ttpci/budget.h with 100% similarity]
drivers/media/pci/ttpci/ttpci-eeprom.c [moved from drivers/media/dvb/ttpci/ttpci-eeprom.c with 100% similarity]
drivers/media/pci/ttpci/ttpci-eeprom.h [moved from drivers/media/dvb/ttpci/ttpci-eeprom.h with 100% similarity]
drivers/media/usb/dvb-usb/Makefile

index 6c67481..6c11ec5 100644 (file)
@@ -2,7 +2,7 @@
 <para>The kernel demux API defines a driver-internal interface for registering low-level,
 hardware specific driver to a hardware independent demux layer. It is only of interest for
 DVB device driver writers. The header file for this API is named <emphasis role="tt">demux.h</emphasis> and located in
-<emphasis role="tt">drivers/media/dvb/dvb-core</emphasis>.
+<emphasis role="tt">drivers/media/dvb-core</emphasis>.
 </para>
 <para>Maintainer note: This section must be reviewed. It is probably out of date.
 </para>
index 26da8b8..81c8662 100644 (file)
@@ -162,7 +162,7 @@ source "drivers/media/radio/Kconfig"
 #
 
 source "drivers/media/dvb-core/Kconfig"
-source "drivers/media/dvb/Kconfig"
+source "drivers/media/pci/Kconfig"
 source "drivers/media/usb/Kconfig"
 
 comment "Supported FireWire (IEEE 1394) Adapters"
index 46a8dc3..90ec998 100644 (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/ usb/
+obj-$(CONFIG_DVB_CORE)  += dvb-core/ pci/ dvb-frontends/ usb/
 obj-$(CONFIG_DVB_FIREDTV) += firewire/
similarity index 71%
rename from drivers/media/dvb/Kconfig
rename to drivers/media/pci/Kconfig
index e2565a4..3b9164a 100644 (file)
@@ -13,38 +13,38 @@ if DVB_CAPTURE_DRIVERS && DVB_CORE
 
 comment "Supported SAA7146 based PCI Adapters"
        depends on DVB_CORE && PCI && I2C
-source "drivers/media/dvb/ttpci/Kconfig"
+source "drivers/media/pci/ttpci/Kconfig"
 
 comment "Supported FlexCopII (B2C2) Adapters"
        depends on DVB_CORE && (PCI || USB) && I2C
-source "drivers/media/dvb/b2c2/Kconfig"
+source "drivers/media/pci/b2c2/Kconfig"
 
 comment "Supported BT878 Adapters"
        depends on DVB_CORE && PCI && I2C
-source "drivers/media/dvb/bt8xx/Kconfig"
+source "drivers/media/pci/bt8xx/Kconfig"
 
 comment "Supported Pluto2 Adapters"
        depends on DVB_CORE && PCI && I2C
-source "drivers/media/dvb/pluto2/Kconfig"
+source "drivers/media/pci/pluto2/Kconfig"
 
 comment "Supported SDMC DM1105 Adapters"
        depends on DVB_CORE && PCI && I2C
-source "drivers/media/dvb/dm1105/Kconfig"
+source "drivers/media/pci/dm1105/Kconfig"
 
 comment "Supported Earthsoft PT1 Adapters"
        depends on DVB_CORE && PCI && I2C
-source "drivers/media/dvb/pt1/Kconfig"
+source "drivers/media/pci/pt1/Kconfig"
 
 comment "Supported Mantis Adapters"
        depends on DVB_CORE && PCI && I2C
-       source "drivers/media/dvb/mantis/Kconfig"
+       source "drivers/media/pci/mantis/Kconfig"
 
 comment "Supported nGene Adapters"
        depends on DVB_CORE && PCI && I2C
-       source "drivers/media/dvb/ngene/Kconfig"
+       source "drivers/media/pci/ngene/Kconfig"
 
 comment "Supported ddbridge ('Octopus') Adapters"
        depends on DVB_CORE && PCI && I2C
-       source "drivers/media/dvb/ddbridge/Kconfig"
+       source "drivers/media/pci/ddbridge/Kconfig"
 
 endif # DVB_CAPTURE_DRIVERS
index a5630e3..94bdf4d 100644 (file)
@@ -79,4 +79,4 @@ 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/dvb/ttpci
+ccflags-y += -I$(srctree)/drivers/media/pci/ttpci