Commit 25aee3de authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] Rename media/dvb as media/pci 



The remaining dvb drivers are pci, so rename them to match the
bus.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 786baecf

Documentation/DocBook/media/dvb/kdapi.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
<para>The kernel demux API defines a driver-internal interface for registering low-level,

<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

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

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>

<para>Maintainer note: This section must be reviewed. It is probably out of date.

<para>Maintainer note: This section must be reviewed. It is probably out of date.

</para>

</para>

drivers/media/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -162,7 +162,7 @@ source "drivers/media/radio/Kconfig" 
#

#





source "drivers/media/dvb-core/Kconfig"

source "drivers/media/dvb-core/Kconfig"

source "drivers/media/dvb/Kconfig"

source "drivers/media/pci/Kconfig"

source "drivers/media/usb/Kconfig"

source "drivers/media/usb/Kconfig"





comment "Supported FireWire (IEEE 1394) Adapters"

comment "Supported FireWire (IEEE 1394) Adapters"

drivers/media/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,5 +11,5 @@ endif 
obj-y += v4l2-core/ common/ rc/ video/

obj-y += v4l2-core/ common/ rc/ video/





obj-$(CONFIG_VIDEO_DEV) += radio/

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/
 
obj-$(CONFIG_DVB_FIREDTV) += firewire/

drivers/media/dvb/Kconfig→drivers/media/pci/Kconfig

+9 −9
Original line number Original line Diff line number Diff line
@@ -13,38 +13,38 @@ if DVB_CAPTURE_DRIVERS && DVB_CORE 




comment "Supported SAA7146 based PCI Adapters"

comment "Supported SAA7146 based PCI Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

source "drivers/media/dvb/ttpci/Kconfig"

source "drivers/media/pci/ttpci/Kconfig"





comment "Supported FlexCopII (B2C2) Adapters"

comment "Supported FlexCopII (B2C2) Adapters"

	depends on DVB_CORE && (PCI || USB) && I2C

	depends on DVB_CORE && (PCI || USB) && I2C

source "drivers/media/dvb/b2c2/Kconfig"

source "drivers/media/pci/b2c2/Kconfig"





comment "Supported BT878 Adapters"

comment "Supported BT878 Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

source "drivers/media/dvb/bt8xx/Kconfig"

source "drivers/media/pci/bt8xx/Kconfig"





comment "Supported Pluto2 Adapters"

comment "Supported Pluto2 Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

source "drivers/media/dvb/pluto2/Kconfig"

source "drivers/media/pci/pluto2/Kconfig"





comment "Supported SDMC DM1105 Adapters"

comment "Supported SDMC DM1105 Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

source "drivers/media/dvb/dm1105/Kconfig"

source "drivers/media/pci/dm1105/Kconfig"





comment "Supported Earthsoft PT1 Adapters"

comment "Supported Earthsoft PT1 Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

source "drivers/media/dvb/pt1/Kconfig"

source "drivers/media/pci/pt1/Kconfig"





comment "Supported Mantis Adapters"

comment "Supported Mantis Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

	source "drivers/media/dvb/mantis/Kconfig"

	source "drivers/media/pci/mantis/Kconfig"





comment "Supported nGene Adapters"

comment "Supported nGene Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

	source "drivers/media/dvb/ngene/Kconfig"

	source "drivers/media/pci/ngene/Kconfig"





comment "Supported ddbridge ('Octopus') Adapters"

comment "Supported ddbridge ('Octopus') Adapters"

	depends on DVB_CORE && PCI && I2C

	depends on DVB_CORE && PCI && I2C

	source "drivers/media/dvb/ddbridge/Kconfig"

	source "drivers/media/pci/ddbridge/Kconfig"





endif # DVB_CAPTURE_DRIVERS
 
endif # DVB_CAPTURE_DRIVERS

drivers/media/dvb/Makefile→drivers/media/pci/Makefile

+0 −0

File moved.

View file