diff options
-rw-r--r-- | Documentation/DocBook/media/dvb/kdapi.xml | 2 | ||||
-rw-r--r-- | drivers/media/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/pci/Kconfig (renamed from drivers/media/dvb/Kconfig) | 18 | ||||
-rw-r--r-- | drivers/media/pci/Makefile (renamed from drivers/media/dvb/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/Kconfig (renamed from drivers/media/dvb/b2c2/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/Makefile (renamed from drivers/media/dvb/b2c2/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-common.h (renamed from drivers/media/dvb/b2c2/flexcop-common.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-dma.c (renamed from drivers/media/dvb/b2c2/flexcop-dma.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-eeprom.c (renamed from drivers/media/dvb/b2c2/flexcop-eeprom.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-fe-tuner.c (renamed from drivers/media/dvb/b2c2/flexcop-fe-tuner.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-hw-filter.c (renamed from drivers/media/dvb/b2c2/flexcop-hw-filter.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-i2c.c (renamed from drivers/media/dvb/b2c2/flexcop-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-misc.c (renamed from drivers/media/dvb/b2c2/flexcop-misc.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-pci.c (renamed from drivers/media/dvb/b2c2/flexcop-pci.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-reg.h (renamed from drivers/media/dvb/b2c2/flexcop-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-sram.c (renamed from drivers/media/dvb/b2c2/flexcop-sram.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-usb.c (renamed from drivers/media/dvb/b2c2/flexcop-usb.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop-usb.h (renamed from drivers/media/dvb/b2c2/flexcop-usb.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop.c (renamed from drivers/media/dvb/b2c2/flexcop.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop.h (renamed from drivers/media/dvb/b2c2/flexcop.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop_ibi_value_be.h (renamed from drivers/media/dvb/b2c2/flexcop_ibi_value_be.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/b2c2/flexcop_ibi_value_le.h (renamed from drivers/media/dvb/b2c2/flexcop_ibi_value_le.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/Kconfig (renamed from drivers/media/dvb/bt8xx/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/Makefile (renamed from drivers/media/dvb/bt8xx/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/bt878.c (renamed from drivers/media/dvb/bt8xx/bt878.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/bt878.h (renamed from drivers/media/dvb/bt8xx/bt878.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/dst.c (renamed from drivers/media/dvb/bt8xx/dst.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/dst_ca.c (renamed from drivers/media/dvb/bt8xx/dst_ca.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/dst_ca.h (renamed from drivers/media/dvb/bt8xx/dst_ca.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/dst_common.h (renamed from drivers/media/dvb/bt8xx/dst_common.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/dst_priv.h (renamed from drivers/media/dvb/bt8xx/dst_priv.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/dvb-bt8xx.c (renamed from drivers/media/dvb/bt8xx/dvb-bt8xx.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/bt8xx/dvb-bt8xx.h (renamed from drivers/media/dvb/bt8xx/dvb-bt8xx.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ddbridge/Kconfig (renamed from drivers/media/dvb/ddbridge/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ddbridge/Makefile (renamed from drivers/media/dvb/ddbridge/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ddbridge/ddbridge-core.c (renamed from drivers/media/dvb/ddbridge/ddbridge-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ddbridge/ddbridge-regs.h (renamed from drivers/media/dvb/ddbridge/ddbridge-regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ddbridge/ddbridge.h (renamed from drivers/media/dvb/ddbridge/ddbridge.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/dm1105/Kconfig (renamed from drivers/media/dvb/dm1105/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/dm1105/Makefile (renamed from drivers/media/dvb/dm1105/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/dm1105/dm1105.c (renamed from drivers/media/dvb/dm1105/dm1105.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/Kconfig (renamed from drivers/media/dvb/mantis/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/Makefile (renamed from drivers/media/dvb/mantis/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/hopper_cards.c (renamed from drivers/media/dvb/mantis/hopper_cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/hopper_vp3028.c (renamed from drivers/media/dvb/mantis/hopper_vp3028.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/hopper_vp3028.h (renamed from drivers/media/dvb/mantis/hopper_vp3028.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_ca.c (renamed from drivers/media/dvb/mantis/mantis_ca.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_ca.h (renamed from drivers/media/dvb/mantis/mantis_ca.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_cards.c (renamed from drivers/media/dvb/mantis/mantis_cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_common.h (renamed from drivers/media/dvb/mantis/mantis_common.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_core.c (renamed from drivers/media/dvb/mantis/mantis_core.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_core.h (renamed from drivers/media/dvb/mantis/mantis_core.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_dma.c (renamed from drivers/media/dvb/mantis/mantis_dma.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_dma.h (renamed from drivers/media/dvb/mantis/mantis_dma.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_dvb.c (renamed from drivers/media/dvb/mantis/mantis_dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_dvb.h (renamed from drivers/media/dvb/mantis/mantis_dvb.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_evm.c (renamed from drivers/media/dvb/mantis/mantis_evm.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_hif.c (renamed from drivers/media/dvb/mantis/mantis_hif.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_hif.h (renamed from drivers/media/dvb/mantis/mantis_hif.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_i2c.c (renamed from drivers/media/dvb/mantis/mantis_i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_i2c.h (renamed from drivers/media/dvb/mantis/mantis_i2c.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_input.c (renamed from drivers/media/dvb/mantis/mantis_input.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_ioc.c (renamed from drivers/media/dvb/mantis/mantis_ioc.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_ioc.h (renamed from drivers/media/dvb/mantis/mantis_ioc.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_link.h (renamed from drivers/media/dvb/mantis/mantis_link.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_pci.c (renamed from drivers/media/dvb/mantis/mantis_pci.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_pci.h (renamed from drivers/media/dvb/mantis/mantis_pci.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_pcmcia.c (renamed from drivers/media/dvb/mantis/mantis_pcmcia.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_reg.h (renamed from drivers/media/dvb/mantis/mantis_reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_uart.c (renamed from drivers/media/dvb/mantis/mantis_uart.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_uart.h (renamed from drivers/media/dvb/mantis/mantis_uart.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp1033.c (renamed from drivers/media/dvb/mantis/mantis_vp1033.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp1033.h (renamed from drivers/media/dvb/mantis/mantis_vp1033.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp1034.c (renamed from drivers/media/dvb/mantis/mantis_vp1034.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp1034.h (renamed from drivers/media/dvb/mantis/mantis_vp1034.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp1041.c (renamed from drivers/media/dvb/mantis/mantis_vp1041.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp1041.h (renamed from drivers/media/dvb/mantis/mantis_vp1041.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp2033.c (renamed from drivers/media/dvb/mantis/mantis_vp2033.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp2033.h (renamed from drivers/media/dvb/mantis/mantis_vp2033.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp2040.c (renamed from drivers/media/dvb/mantis/mantis_vp2040.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp2040.h (renamed from drivers/media/dvb/mantis/mantis_vp2040.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp3028.c (renamed from drivers/media/dvb/mantis/mantis_vp3028.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp3028.h (renamed from drivers/media/dvb/mantis/mantis_vp3028.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp3030.c (renamed from drivers/media/dvb/mantis/mantis_vp3030.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp3030.h (renamed from drivers/media/dvb/mantis/mantis_vp3030.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ngene/Kconfig (renamed from drivers/media/dvb/ngene/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ngene/Makefile (renamed from drivers/media/dvb/ngene/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ngene/ngene-cards.c (renamed from drivers/media/dvb/ngene/ngene-cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ngene/ngene-core.c (renamed from drivers/media/dvb/ngene/ngene-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ngene/ngene-dvb.c (renamed from drivers/media/dvb/ngene/ngene-dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ngene/ngene-i2c.c (renamed from drivers/media/dvb/ngene/ngene-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ngene/ngene.h (renamed from drivers/media/dvb/ngene/ngene.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pluto2/Kconfig (renamed from drivers/media/dvb/pluto2/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pluto2/Makefile (renamed from drivers/media/dvb/pluto2/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pluto2/pluto2.c (renamed from drivers/media/dvb/pluto2/pluto2.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pt1/Kconfig (renamed from drivers/media/dvb/pt1/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pt1/Makefile (renamed from drivers/media/dvb/pt1/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pt1/pt1.c (renamed from drivers/media/dvb/pt1/pt1.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pt1/va1j5jf8007s.c (renamed from drivers/media/dvb/pt1/va1j5jf8007s.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pt1/va1j5jf8007s.h (renamed from drivers/media/dvb/pt1/va1j5jf8007s.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pt1/va1j5jf8007t.c (renamed from drivers/media/dvb/pt1/va1j5jf8007t.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/pt1/va1j5jf8007t.h (renamed from drivers/media/dvb/pt1/va1j5jf8007t.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/Kconfig (renamed from drivers/media/dvb/ttpci/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/Makefile (renamed from drivers/media/dvb/ttpci/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110.c (renamed from drivers/media/dvb/ttpci/av7110.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110.h (renamed from drivers/media/dvb/ttpci/av7110.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_av.c (renamed from drivers/media/dvb/ttpci/av7110_av.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_av.h (renamed from drivers/media/dvb/ttpci/av7110_av.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_ca.c (renamed from drivers/media/dvb/ttpci/av7110_ca.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_ca.h (renamed from drivers/media/dvb/ttpci/av7110_ca.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_hw.c (renamed from drivers/media/dvb/ttpci/av7110_hw.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_hw.h (renamed from drivers/media/dvb/ttpci/av7110_hw.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_ipack.c (renamed from drivers/media/dvb/ttpci/av7110_ipack.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_ipack.h (renamed from drivers/media/dvb/ttpci/av7110_ipack.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_ir.c (renamed from drivers/media/dvb/ttpci/av7110_ir.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110_v4l.c (renamed from drivers/media/dvb/ttpci/av7110_v4l.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/budget-av.c (renamed from drivers/media/dvb/ttpci/budget-av.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/budget-ci.c (renamed from drivers/media/dvb/ttpci/budget-ci.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/budget-core.c (renamed from drivers/media/dvb/ttpci/budget-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/budget-patch.c (renamed from drivers/media/dvb/ttpci/budget-patch.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/budget.c (renamed from drivers/media/dvb/ttpci/budget.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/budget.h (renamed from drivers/media/dvb/ttpci/budget.h) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/ttpci-eeprom.c (renamed from drivers/media/dvb/ttpci/ttpci-eeprom.c) | 0 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/ttpci-eeprom.h (renamed from drivers/media/dvb/ttpci/ttpci-eeprom.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/dvb-usb/Makefile | 2 |
126 files changed, 13 insertions, 13 deletions
diff --git a/Documentation/DocBook/media/dvb/kdapi.xml b/Documentation/DocBook/media/dvb/kdapi.xml index 6c67481..6c11ec5 100644 --- a/Documentation/DocBook/media/dvb/kdapi.xml +++ b/Documentation/DocBook/media/dvb/kdapi.xml @@ -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> diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 26da8b8..81c8662 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -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" diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 46a8dc3..90ec998 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile @@ -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/ diff --git a/drivers/media/dvb/Kconfig b/drivers/media/pci/Kconfig index e2565a4..3b9164a 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/pci/Kconfig @@ -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 diff --git a/drivers/media/dvb/Makefile b/drivers/media/pci/Makefile index c5fa43a..c5fa43a 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/pci/Makefile diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/pci/b2c2/Kconfig index 9e57814..9e57814 100644 --- a/drivers/media/dvb/b2c2/Kconfig +++ b/drivers/media/pci/b2c2/Kconfig diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/pci/b2c2/Makefile index 7a1f5ce..7a1f5ce 100644 --- a/drivers/media/dvb/b2c2/Makefile +++ b/drivers/media/pci/b2c2/Makefile diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/pci/b2c2/flexcop-common.h index 437912e..437912e 100644 --- a/drivers/media/dvb/b2c2/flexcop-common.h +++ b/drivers/media/pci/b2c2/flexcop-common.h diff --git a/drivers/media/dvb/b2c2/flexcop-dma.c b/drivers/media/pci/b2c2/flexcop-dma.c index 2881e0d..2881e0d 100644 --- a/drivers/media/dvb/b2c2/flexcop-dma.c +++ b/drivers/media/pci/b2c2/flexcop-dma.c diff --git a/drivers/media/dvb/b2c2/flexcop-eeprom.c b/drivers/media/pci/b2c2/flexcop-eeprom.c index a25373a..a25373a 100644 --- a/drivers/media/dvb/b2c2/flexcop-eeprom.c +++ b/drivers/media/pci/b2c2/flexcop-eeprom.c diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/pci/b2c2/flexcop-fe-tuner.c index 850a6c6..850a6c6 100644 --- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/pci/b2c2/flexcop-fe-tuner.c diff --git a/drivers/media/dvb/b2c2/flexcop-hw-filter.c b/drivers/media/pci/b2c2/flexcop-hw-filter.c index 77e4547..77e4547 100644 --- a/drivers/media/dvb/b2c2/flexcop-hw-filter.c +++ b/drivers/media/pci/b2c2/flexcop-hw-filter.c diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/pci/b2c2/flexcop-i2c.c index 965d5eb..965d5eb 100644 --- a/drivers/media/dvb/b2c2/flexcop-i2c.c +++ b/drivers/media/pci/b2c2/flexcop-i2c.c diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/pci/b2c2/flexcop-misc.c index f06f3a9..f06f3a9 100644 --- a/drivers/media/dvb/b2c2/flexcop-misc.c +++ b/drivers/media/pci/b2c2/flexcop-misc.c diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c index 44f8fb5..44f8fb5 100644 --- a/drivers/media/dvb/b2c2/flexcop-pci.c +++ b/drivers/media/pci/b2c2/flexcop-pci.c diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/pci/b2c2/flexcop-reg.h index dc4528d..dc4528d 100644 --- a/drivers/media/dvb/b2c2/flexcop-reg.h +++ b/drivers/media/pci/b2c2/flexcop-reg.h diff --git a/drivers/media/dvb/b2c2/flexcop-sram.c b/drivers/media/pci/b2c2/flexcop-sram.c index f2199e4..f2199e4 100644 --- a/drivers/media/dvb/b2c2/flexcop-sram.c +++ b/drivers/media/pci/b2c2/flexcop-sram.c diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/pci/b2c2/flexcop-usb.c index 8b6275f..8b6275f 100644 --- a/drivers/media/dvb/b2c2/flexcop-usb.c +++ b/drivers/media/pci/b2c2/flexcop-usb.c diff --git a/drivers/media/dvb/b2c2/flexcop-usb.h b/drivers/media/pci/b2c2/flexcop-usb.h index 92529a9..92529a9 100644 --- a/drivers/media/dvb/b2c2/flexcop-usb.h +++ b/drivers/media/pci/b2c2/flexcop-usb.h diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/pci/b2c2/flexcop.c index b1e8c99..b1e8c99 100644 --- a/drivers/media/dvb/b2c2/flexcop.c +++ b/drivers/media/pci/b2c2/flexcop.c diff --git a/drivers/media/dvb/b2c2/flexcop.h b/drivers/media/pci/b2c2/flexcop.h index 897b10c..897b10c 100644 --- a/drivers/media/dvb/b2c2/flexcop.h +++ b/drivers/media/pci/b2c2/flexcop.h diff --git a/drivers/media/dvb/b2c2/flexcop_ibi_value_be.h b/drivers/media/pci/b2c2/flexcop_ibi_value_be.h index 8f64bdb..8f64bdb 100644 --- a/drivers/media/dvb/b2c2/flexcop_ibi_value_be.h +++ b/drivers/media/pci/b2c2/flexcop_ibi_value_be.h diff --git a/drivers/media/dvb/b2c2/flexcop_ibi_value_le.h b/drivers/media/pci/b2c2/flexcop_ibi_value_le.h index c75830d..c75830d 100644 --- a/drivers/media/dvb/b2c2/flexcop_ibi_value_le.h +++ b/drivers/media/pci/b2c2/flexcop_ibi_value_le.h diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig index 8668e63..8668e63 100644 --- a/drivers/media/dvb/bt8xx/Kconfig +++ b/drivers/media/pci/bt8xx/Kconfig diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/pci/bt8xx/Makefile index 36591ae..36591ae 100644 --- a/drivers/media/dvb/bt8xx/Makefile +++ b/drivers/media/pci/bt8xx/Makefile diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c index b34fa95..b34fa95 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/pci/bt8xx/bt878.c diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/pci/bt8xx/bt878.h index d19b592..d19b592 100644 --- a/drivers/media/dvb/bt8xx/bt878.h +++ b/drivers/media/pci/bt8xx/bt878.h diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c index 430b3eb..430b3eb 100644 --- a/drivers/media/dvb/bt8xx/dst.c +++ b/drivers/media/pci/bt8xx/dst.c diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/pci/bt8xx/dst_ca.c index ee3884f..ee3884f 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/pci/bt8xx/dst_ca.c diff --git a/drivers/media/dvb/bt8xx/dst_ca.h b/drivers/media/pci/bt8xx/dst_ca.h index 59cd0dd..59cd0dd 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.h +++ b/drivers/media/pci/bt8xx/dst_ca.h diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/pci/bt8xx/dst_common.h index d70d98f..d70d98f 100644 --- a/drivers/media/dvb/bt8xx/dst_common.h +++ b/drivers/media/pci/bt8xx/dst_common.h diff --git a/drivers/media/dvb/bt8xx/dst_priv.h b/drivers/media/pci/bt8xx/dst_priv.h index 3974a4c..3974a4c 100644 --- a/drivers/media/dvb/bt8xx/dst_priv.h +++ b/drivers/media/pci/bt8xx/dst_priv.h diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c index 81fab9a..81fab9a 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/pci/bt8xx/dvb-bt8xx.h index 4499ed2..4499ed2 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/drivers/media/pci/bt8xx/dvb-bt8xx.h diff --git a/drivers/media/dvb/ddbridge/Kconfig b/drivers/media/pci/ddbridge/Kconfig index d099e1a..d099e1a 100644 --- a/drivers/media/dvb/ddbridge/Kconfig +++ b/drivers/media/pci/ddbridge/Kconfig diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/pci/ddbridge/Makefile index 9d083c9..9d083c9 100644 --- a/drivers/media/dvb/ddbridge/Makefile +++ b/drivers/media/pci/ddbridge/Makefile diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index ebf3f05..ebf3f05 100644 --- a/drivers/media/dvb/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c diff --git a/drivers/media/dvb/ddbridge/ddbridge-regs.h b/drivers/media/pci/ddbridge/ddbridge-regs.h index a3ccb31..a3ccb31 100644 --- a/drivers/media/dvb/ddbridge/ddbridge-regs.h +++ b/drivers/media/pci/ddbridge/ddbridge-regs.h diff --git a/drivers/media/dvb/ddbridge/ddbridge.h b/drivers/media/pci/ddbridge/ddbridge.h index 8b1b41d..8b1b41d 100644 --- a/drivers/media/dvb/ddbridge/ddbridge.h +++ b/drivers/media/pci/ddbridge/ddbridge.h diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/pci/dm1105/Kconfig index f3de0a4..f3de0a4 100644 --- a/drivers/media/dvb/dm1105/Kconfig +++ b/drivers/media/pci/dm1105/Kconfig diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/pci/dm1105/Makefile index 3275851..3275851 100644 --- a/drivers/media/dvb/dm1105/Makefile +++ b/drivers/media/pci/dm1105/Makefile diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c index a609b3a..a609b3a 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/pci/dm1105/dm1105.c diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/pci/mantis/Kconfig index a13a505..a13a505 100644 --- a/drivers/media/dvb/mantis/Kconfig +++ b/drivers/media/pci/mantis/Kconfig diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/pci/mantis/Makefile index f715051..f715051 100644 --- a/drivers/media/dvb/mantis/Makefile +++ b/drivers/media/pci/mantis/Makefile diff --git a/drivers/media/dvb/mantis/hopper_cards.c b/drivers/media/pci/mantis/hopper_cards.c index cc0251e..cc0251e 100644 --- a/drivers/media/dvb/mantis/hopper_cards.c +++ b/drivers/media/pci/mantis/hopper_cards.c diff --git a/drivers/media/dvb/mantis/hopper_vp3028.c b/drivers/media/pci/mantis/hopper_vp3028.c index 68a29f8..68a29f8 100644 --- a/drivers/media/dvb/mantis/hopper_vp3028.c +++ b/drivers/media/pci/mantis/hopper_vp3028.c diff --git a/drivers/media/dvb/mantis/hopper_vp3028.h b/drivers/media/pci/mantis/hopper_vp3028.h index 5723949..5723949 100644 --- a/drivers/media/dvb/mantis/hopper_vp3028.h +++ b/drivers/media/pci/mantis/hopper_vp3028.h diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/pci/mantis/mantis_ca.c index 3d70469..3d70469 100644 --- a/drivers/media/dvb/mantis/mantis_ca.c +++ b/drivers/media/pci/mantis/mantis_ca.c diff --git a/drivers/media/dvb/mantis/mantis_ca.h b/drivers/media/pci/mantis/mantis_ca.h index dc63e55..dc63e55 100644 --- a/drivers/media/dvb/mantis/mantis_ca.h +++ b/drivers/media/pci/mantis/mantis_ca.h diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/pci/mantis/mantis_cards.c index 0207d1f..0207d1f 100644 --- a/drivers/media/dvb/mantis/mantis_cards.c +++ b/drivers/media/pci/mantis/mantis_cards.c diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/pci/mantis/mantis_common.h index f2410cf..f2410cf 100644 --- a/drivers/media/dvb/mantis/mantis_common.h +++ b/drivers/media/pci/mantis/mantis_common.h diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/pci/mantis/mantis_core.c index 684d906..684d906 100644 --- a/drivers/media/dvb/mantis/mantis_core.c +++ b/drivers/media/pci/mantis/mantis_core.c diff --git a/drivers/media/dvb/mantis/mantis_core.h b/drivers/media/pci/mantis/mantis_core.h index 833ee42..833ee42 100644 --- a/drivers/media/dvb/mantis/mantis_core.h +++ b/drivers/media/pci/mantis/mantis_core.h diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/pci/mantis/mantis_dma.c index 566c407..566c407 100644 --- a/drivers/media/dvb/mantis/mantis_dma.c +++ b/drivers/media/pci/mantis/mantis_dma.c diff --git a/drivers/media/dvb/mantis/mantis_dma.h b/drivers/media/pci/mantis/mantis_dma.h index 6be00fa..6be00fa 100644 --- a/drivers/media/dvb/mantis/mantis_dma.h +++ b/drivers/media/pci/mantis/mantis_dma.h diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/pci/mantis/mantis_dvb.c index 5d15c6b..5d15c6b 100644 --- a/drivers/media/dvb/mantis/mantis_dvb.c +++ b/drivers/media/pci/mantis/mantis_dvb.c diff --git a/drivers/media/dvb/mantis/mantis_dvb.h b/drivers/media/pci/mantis/mantis_dvb.h index 464199d..464199d 100644 --- a/drivers/media/dvb/mantis/mantis_dvb.h +++ b/drivers/media/pci/mantis/mantis_dvb.h diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/pci/mantis/mantis_evm.c index 71ce528..71ce528 100644 --- a/drivers/media/dvb/mantis/mantis_evm.c +++ b/drivers/media/pci/mantis/mantis_evm.c diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/pci/mantis/mantis_hif.c index 10c68df..10c68df 100644 --- a/drivers/media/dvb/mantis/mantis_hif.c +++ b/drivers/media/pci/mantis/mantis_hif.c diff --git a/drivers/media/dvb/mantis/mantis_hif.h b/drivers/media/pci/mantis/mantis_hif.h index 9094f9e..9094f9e 100644 --- a/drivers/media/dvb/mantis/mantis_hif.h +++ b/drivers/media/pci/mantis/mantis_hif.h diff --git a/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/pci/mantis/mantis_i2c.c index e779451..e779451 100644 --- a/drivers/media/dvb/mantis/mantis_i2c.c +++ b/drivers/media/pci/mantis/mantis_i2c.c diff --git a/drivers/media/dvb/mantis/mantis_i2c.h b/drivers/media/pci/mantis/mantis_i2c.h index 1342df2..1342df2 100644 --- a/drivers/media/dvb/mantis/mantis_i2c.h +++ b/drivers/media/pci/mantis/mantis_i2c.h diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/pci/mantis/mantis_input.c index db6d54d..db6d54d 100644 --- a/drivers/media/dvb/mantis/mantis_input.c +++ b/drivers/media/pci/mantis/mantis_input.c diff --git a/drivers/media/dvb/mantis/mantis_ioc.c b/drivers/media/pci/mantis/mantis_ioc.c index 24fcdc6..24fcdc6 100644 --- a/drivers/media/dvb/mantis/mantis_ioc.c +++ b/drivers/media/pci/mantis/mantis_ioc.c diff --git a/drivers/media/dvb/mantis/mantis_ioc.h b/drivers/media/pci/mantis/mantis_ioc.h index d56e002..d56e002 100644 --- a/drivers/media/dvb/mantis/mantis_ioc.h +++ b/drivers/media/pci/mantis/mantis_ioc.h diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/pci/mantis/mantis_link.h index 2a81477..2a81477 100644 --- a/drivers/media/dvb/mantis/mantis_link.h +++ b/drivers/media/pci/mantis/mantis_link.h diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c index 371558a..371558a 100644 --- a/drivers/media/dvb/mantis/mantis_pci.c +++ b/drivers/media/pci/mantis/mantis_pci.c diff --git a/drivers/media/dvb/mantis/mantis_pci.h b/drivers/media/pci/mantis/mantis_pci.h index 65f0045..65f0045 100644 --- a/drivers/media/dvb/mantis/mantis_pci.h +++ b/drivers/media/pci/mantis/mantis_pci.h diff --git a/drivers/media/dvb/mantis/mantis_pcmcia.c b/drivers/media/pci/mantis/mantis_pcmcia.c index 2f188c0..2f188c0 100644 --- a/drivers/media/dvb/mantis/mantis_pcmcia.c +++ b/drivers/media/pci/mantis/mantis_pcmcia.c diff --git a/drivers/media/dvb/mantis/mantis_reg.h b/drivers/media/pci/mantis/mantis_reg.h index 7761f9d..7761f9d 100644 --- a/drivers/media/dvb/mantis/mantis_reg.h +++ b/drivers/media/pci/mantis/mantis_reg.h diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/pci/mantis/mantis_uart.c index 18340da..18340da 100644 --- a/drivers/media/dvb/mantis/mantis_uart.c +++ b/drivers/media/pci/mantis/mantis_uart.c diff --git a/drivers/media/dvb/mantis/mantis_uart.h b/drivers/media/pci/mantis/mantis_uart.h index ffb62a0..ffb62a0 100644 --- a/drivers/media/dvb/mantis/mantis_uart.h +++ b/drivers/media/pci/mantis/mantis_uart.h diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/pci/mantis/mantis_vp1033.c index ad013e9..ad013e9 100644 --- a/drivers/media/dvb/mantis/mantis_vp1033.c +++ b/drivers/media/pci/mantis/mantis_vp1033.c diff --git a/drivers/media/dvb/mantis/mantis_vp1033.h b/drivers/media/pci/mantis/mantis_vp1033.h index 7daaa1b..7daaa1b 100644 --- a/drivers/media/dvb/mantis/mantis_vp1033.h +++ b/drivers/media/pci/mantis/mantis_vp1033.h diff --git a/drivers/media/dvb/mantis/mantis_vp1034.c b/drivers/media/pci/mantis/mantis_vp1034.c index 430ae84..430ae84 100644 --- a/drivers/media/dvb/mantis/mantis_vp1034.c +++ b/drivers/media/pci/mantis/mantis_vp1034.c diff --git a/drivers/media/dvb/mantis/mantis_vp1034.h b/drivers/media/pci/mantis/mantis_vp1034.h index 323f38e..323f38e 100644 --- a/drivers/media/dvb/mantis/mantis_vp1034.h +++ b/drivers/media/pci/mantis/mantis_vp1034.h diff --git a/drivers/media/dvb/mantis/mantis_vp1041.c b/drivers/media/pci/mantis/mantis_vp1041.c index 07aa887..07aa887 100644 --- a/drivers/media/dvb/mantis/mantis_vp1041.c +++ b/drivers/media/pci/mantis/mantis_vp1041.c diff --git a/drivers/media/dvb/mantis/mantis_vp1041.h b/drivers/media/pci/mantis/mantis_vp1041.h index 1ae5b3d..1ae5b3d 100644 --- a/drivers/media/dvb/mantis/mantis_vp1041.h +++ b/drivers/media/pci/mantis/mantis_vp1041.h diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/pci/mantis/mantis_vp2033.c index 1ca6837..1ca6837 100644 --- a/drivers/media/dvb/mantis/mantis_vp2033.c +++ b/drivers/media/pci/mantis/mantis_vp2033.c diff --git a/drivers/media/dvb/mantis/mantis_vp2033.h b/drivers/media/pci/mantis/mantis_vp2033.h index c55242b..c55242b 100644 --- a/drivers/media/dvb/mantis/mantis_vp2033.h +++ b/drivers/media/pci/mantis/mantis_vp2033.h diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/pci/mantis/mantis_vp2040.c index d480741..d480741 100644 --- a/drivers/media/dvb/mantis/mantis_vp2040.c +++ b/drivers/media/pci/mantis/mantis_vp2040.c diff --git a/drivers/media/dvb/mantis/mantis_vp2040.h b/drivers/media/pci/mantis/mantis_vp2040.h index d125e21..d125e21 100644 --- a/drivers/media/dvb/mantis/mantis_vp2040.h +++ b/drivers/media/pci/mantis/mantis_vp2040.h diff --git a/drivers/media/dvb/mantis/mantis_vp3028.c b/drivers/media/pci/mantis/mantis_vp3028.c index 4155c83..4155c83 100644 --- a/drivers/media/dvb/mantis/mantis_vp3028.c +++ b/drivers/media/pci/mantis/mantis_vp3028.c diff --git a/drivers/media/dvb/mantis/mantis_vp3028.h b/drivers/media/pci/mantis/mantis_vp3028.h index b07be6a..b07be6a 100644 --- a/drivers/media/dvb/mantis/mantis_vp3028.h +++ b/drivers/media/pci/mantis/mantis_vp3028.h diff --git a/drivers/media/dvb/mantis/mantis_vp3030.c b/drivers/media/pci/mantis/mantis_vp3030.c index c09308cd..c09308cd 100644 --- a/drivers/media/dvb/mantis/mantis_vp3030.c +++ b/drivers/media/pci/mantis/mantis_vp3030.c diff --git a/drivers/media/dvb/mantis/mantis_vp3030.h b/drivers/media/pci/mantis/mantis_vp3030.h index 5f12c42..5f12c42 100644 --- a/drivers/media/dvb/mantis/mantis_vp3030.h +++ b/drivers/media/pci/mantis/mantis_vp3030.h diff --git a/drivers/media/dvb/ngene/Kconfig b/drivers/media/pci/ngene/Kconfig index 64c8470..64c8470 100644 --- a/drivers/media/dvb/ngene/Kconfig +++ b/drivers/media/pci/ngene/Kconfig diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/pci/ngene/Makefile index 6399708..6399708 100644 --- a/drivers/media/dvb/ngene/Makefile +++ b/drivers/media/pci/ngene/Makefile diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c index a6cd695..a6cd695 100644 --- a/drivers/media/dvb/ngene/ngene-cards.c +++ b/drivers/media/pci/ngene/ngene-cards.c diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c index c8e0d5b..c8e0d5b 100644 --- a/drivers/media/dvb/ngene/ngene-core.c +++ b/drivers/media/pci/ngene/ngene-core.c diff --git a/drivers/media/dvb/ngene/ngene-dvb.c b/drivers/media/pci/ngene/ngene-dvb.c index fcb16a6..fcb16a6 100644 --- a/drivers/media/dvb/ngene/ngene-dvb.c +++ b/drivers/media/pci/ngene/ngene-dvb.c diff --git a/drivers/media/dvb/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c index d28554f..d28554f 100644 --- a/drivers/media/dvb/ngene/ngene-i2c.c +++ b/drivers/media/pci/ngene/ngene-i2c.c diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/pci/ngene/ngene.h index 5443dc0..5443dc0 100644 --- a/drivers/media/dvb/ngene/ngene.h +++ b/drivers/media/pci/ngene/ngene.h diff --git a/drivers/media/dvb/pluto2/Kconfig b/drivers/media/pci/pluto2/Kconfig index 7d8e6e8..7d8e6e8 100644 --- a/drivers/media/dvb/pluto2/Kconfig +++ b/drivers/media/pci/pluto2/Kconfig diff --git a/drivers/media/dvb/pluto2/Makefile b/drivers/media/pci/pluto2/Makefile index 524bf84..524bf84 100644 --- a/drivers/media/dvb/pluto2/Makefile +++ b/drivers/media/pci/pluto2/Makefile diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c index f148b19..f148b19 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/pci/pluto2/pluto2.c diff --git a/drivers/media/dvb/pt1/Kconfig b/drivers/media/pci/pt1/Kconfig index 24501d5..24501d5 100644 --- a/drivers/media/dvb/pt1/Kconfig +++ b/drivers/media/pci/pt1/Kconfig diff --git a/drivers/media/dvb/pt1/Makefile b/drivers/media/pci/pt1/Makefile index 98e3912..98e3912 100644 --- a/drivers/media/dvb/pt1/Makefile +++ b/drivers/media/pci/pt1/Makefile diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c index 15b35c4..15b35c4 100644 --- a/drivers/media/dvb/pt1/pt1.c +++ b/drivers/media/pci/pt1/pt1.c diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.c b/drivers/media/pci/pt1/va1j5jf8007s.c index d980dfb..d980dfb 100644 --- a/drivers/media/dvb/pt1/va1j5jf8007s.c +++ b/drivers/media/pci/pt1/va1j5jf8007s.c diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.h b/drivers/media/pci/pt1/va1j5jf8007s.h index b7d6f05..b7d6f05 100644 --- a/drivers/media/dvb/pt1/va1j5jf8007s.h +++ b/drivers/media/pci/pt1/va1j5jf8007s.h diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.c b/drivers/media/pci/pt1/va1j5jf8007t.c index 2db15159..2db15159 100644 --- a/drivers/media/dvb/pt1/va1j5jf8007t.c +++ b/drivers/media/pci/pt1/va1j5jf8007t.c diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.h b/drivers/media/pci/pt1/va1j5jf8007t.h index 2903be5..2903be5 100644 --- a/drivers/media/dvb/pt1/va1j5jf8007t.h +++ b/drivers/media/pci/pt1/va1j5jf8007t.h diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/pci/ttpci/Kconfig index 9d83ced..9d83ced 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/pci/ttpci/Kconfig diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/pci/ttpci/Makefile index 22a235f..22a235f 100644 --- a/drivers/media/dvb/ttpci/Makefile +++ b/drivers/media/pci/ttpci/Makefile diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c index 4bd8bd5..4bd8bd5 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/pci/ttpci/av7110.c diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/pci/ttpci/av7110.h index 88b3b2d..88b3b2d 100644 --- a/drivers/media/dvb/ttpci/av7110.h +++ b/drivers/media/pci/ttpci/av7110.h diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/pci/ttpci/av7110_av.c index 952b33d..952b33d 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/pci/ttpci/av7110_av.c diff --git a/drivers/media/dvb/ttpci/av7110_av.h b/drivers/media/pci/ttpci/av7110_av.h index 5f02ef8..5f02ef8 100644 --- a/drivers/media/dvb/ttpci/av7110_av.h +++ b/drivers/media/pci/ttpci/av7110_av.h diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/pci/ttpci/av7110_ca.c index 9fc1dd0..9fc1dd0 100644 --- a/drivers/media/dvb/ttpci/av7110_ca.c +++ b/drivers/media/pci/ttpci/av7110_ca.c diff --git a/drivers/media/dvb/ttpci/av7110_ca.h b/drivers/media/pci/ttpci/av7110_ca.h index 70ee855..70ee855 100644 --- a/drivers/media/dvb/ttpci/av7110_ca.h +++ b/drivers/media/pci/ttpci/av7110_ca.h diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c index f1cbfe5..f1cbfe5 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/drivers/media/pci/ttpci/av7110_hw.c diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/pci/ttpci/av7110_hw.h index 1634aba..1634aba 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.h +++ b/drivers/media/pci/ttpci/av7110_hw.h diff --git a/drivers/media/dvb/ttpci/av7110_ipack.c b/drivers/media/pci/ttpci/av7110_ipack.c index 699ef8b..699ef8b 100644 --- a/drivers/media/dvb/ttpci/av7110_ipack.c +++ b/drivers/media/pci/ttpci/av7110_ipack.c diff --git a/drivers/media/dvb/ttpci/av7110_ipack.h b/drivers/media/pci/ttpci/av7110_ipack.h index becf94d..becf94d 100644 --- a/drivers/media/dvb/ttpci/av7110_ipack.h +++ b/drivers/media/pci/ttpci/av7110_ipack.h diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c index 908f272..908f272 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/pci/ttpci/av7110_ir.c diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/pci/ttpci/av7110_v4l.c index 1b2d151..1b2d151 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/drivers/media/pci/ttpci/av7110_v4l.c diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/pci/ttpci/budget-av.c index 12ddb53..12ddb53 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/pci/ttpci/budget-av.c diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/pci/ttpci/budget-ci.c index 98e5241..98e5241 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/pci/ttpci/budget-ci.c diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/pci/ttpci/budget-core.c index 37d02fe..37d02fe 100644 --- a/drivers/media/dvb/ttpci/budget-core.c +++ b/drivers/media/pci/ttpci/budget-core.c diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/pci/ttpci/budget-patch.c index 2cb35c2..2cb35c2 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/pci/ttpci/budget-patch.c diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/pci/ttpci/budget.c index 7e6e43a..7e6e43a 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/pci/ttpci/budget.c diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/pci/ttpci/budget.h index 3d8a806..3d8a806 100644 --- a/drivers/media/dvb/ttpci/budget.h +++ b/drivers/media/pci/ttpci/budget.h diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/pci/ttpci/ttpci-eeprom.c index 32d4315..32d4315 100644 --- a/drivers/media/dvb/ttpci/ttpci-eeprom.c +++ b/drivers/media/pci/ttpci/ttpci-eeprom.c diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.h b/drivers/media/pci/ttpci/ttpci-eeprom.h index dcc33d5..dcc33d5 100644 --- a/drivers/media/dvb/ttpci/ttpci-eeprom.h +++ b/drivers/media/pci/ttpci/ttpci-eeprom.h diff --git a/drivers/media/usb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile index a5630e3..94bdf4d5 100644 --- a/drivers/media/usb/dvb-usb/Makefile +++ b/drivers/media/usb/dvb-usb/Makefile @@ -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 |