[media] rename most media/video pci drivers to media/pci

Rename all PCI drivers with their own directory under
drivers/media/video into drivers/media/pci and update the
building system.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/pci/Kconfig

@@ -2,40 +2,36 @@
 # DVB device configuration
 #
 
-menuconfig DVB_CAPTURE_DRIVERS
+menu "Media PCI Adapters"
-	bool "DVB/ATSC PCI adapters"
+	visible if PCI && MEDIA_SUPPORT
-	depends on DVB_CORE
-	default y
-	---help---
-	  Say Y to select Digital TV adapters
 
-if DVB_CAPTURE_DRIVERS && DVB_CORE && PCI && I2C
+if MEDIA_ANALOG_TV_SUPPORT
+	comment "Media capture/analog TV support"
+source "drivers/media/pci/ivtv/Kconfig"
+source "drivers/media/pci/zoran/Kconfig"
+endif
 
-comment "Supported SAA7146 based PCI Adapters"
+if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
-source "drivers/media/pci/ttpci/Kconfig"
+	comment "Media capture/analog/hybrid TV support"
-
+source "drivers/media/pci/cx18/Kconfig"
-comment "Supported FlexCopII (B2C2) PCI Adapters"
+source "drivers/media/pci/cx23885/Kconfig"
-source "drivers/media/pci/b2c2/Kconfig"
+source "drivers/media/pci/cx25821/Kconfig"
-
+source "drivers/media/pci/cx88/Kconfig"
-comment "Supported BT878 Adapters"
 source "drivers/media/pci/bt8xx/Kconfig"
+source "drivers/media/pci/saa7134/Kconfig"
+source "drivers/media/pci/saa7164/Kconfig"
+endif
 
-comment "Supported Pluto2 Adapters"
+if MEDIA_DIGITAL_TV_SUPPORT
+	comment "Media digital TV PCI Adapters"
+source "drivers/media/pci/ttpci/Kconfig"
+source "drivers/media/pci/b2c2/Kconfig"
 source "drivers/media/pci/pluto2/Kconfig"
-
-comment "Supported SDMC DM1105 Adapters"
 source "drivers/media/pci/dm1105/Kconfig"
-
-comment "Supported Earthsoft PT1 Adapters"
 source "drivers/media/pci/pt1/Kconfig"
-
-comment "Supported Mantis Adapters"
 source "drivers/media/pci/mantis/Kconfig"
-
-comment "Supported nGene Adapters"
 source "drivers/media/pci/ngene/Kconfig"
-
-comment "Supported ddbridge ('Octopus') Adapters"
 source "drivers/media/pci/ddbridge/Kconfig"
+endif
 
-endif # DVB_CAPTURE_DRIVERS
+endmenu

drivers/media/pci/Makefile

@@ -4,7 +4,6 @@
 
 obj-y        :=	ttpci/		\
 		b2c2/		\
-		bt8xx/		\
 		pluto2/		\
 		dm1105/		\
 		pt1/		\
@@ -12,3 +11,13 @@ obj-y        :=	ttpci/		\
 		ngene/		\
 		ddbridge/	\
 		b2c2/
+
+obj-$(CONFIG_VIDEO_IVTV) += ivtv/
+obj-$(CONFIG_VIDEO_ZORAN) += zoran/
+obj-$(CONFIG_VIDEO_CX18) += cx18/
+obj-$(CONFIG_VIDEO_CX23885) += cx23885/
+obj-$(CONFIG_VIDEO_CX25821) += cx25821/
+obj-$(CONFIG_VIDEO_CX88) += cx88/
+obj-$(CONFIG_VIDEO_BT848) += bt8xx/
+obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
+obj-$(CONFIG_VIDEO_SAA7164) += saa7164/