[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>
git-mirror · Aug 15, 2012 · b285192 · b285192
1 parent 68de959
commit b285192
Show file tree

Hide file tree

Showing 216 changed files with 33 additions and 53 deletions.
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
@@ -2,40 +2,36 @@
 # DVB device configuration
 #
 
-menuconfig DVB_CAPTURE_DRIVERS
-	bool "DVB/ATSC PCI adapters"
-	depends on DVB_CORE
-	default y
-	---help---
-	  Say Y to select Digital TV adapters
-
-if DVB_CAPTURE_DRIVERS && DVB_CORE && PCI && I2C
+menu "Media PCI Adapters"
+	visible if PCI && MEDIA_SUPPORT
+
+if MEDIA_ANALOG_TV_SUPPORT
+	comment "Media capture/analog TV support"
+source "drivers/media/pci/ivtv/Kconfig"
+source "drivers/media/pci/zoran/Kconfig"
+endif
+
+if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
+	comment "Media capture/analog/hybrid TV support"
+source "drivers/media/pci/cx18/Kconfig"
+source "drivers/media/pci/cx23885/Kconfig"
+source "drivers/media/pci/cx25821/Kconfig"
+source "drivers/media/pci/cx88/Kconfig"
+source "drivers/media/pci/bt8xx/Kconfig"
+source "drivers/media/pci/saa7134/Kconfig"
+source "drivers/media/pci/saa7164/Kconfig"
+endif
 
-comment "Supported SAA7146 based PCI Adapters"
+if MEDIA_DIGITAL_TV_SUPPORT
+	comment "Media digital TV PCI Adapters"
 source "drivers/media/pci/ttpci/Kconfig"
-
-comment "Supported FlexCopII (B2C2) PCI Adapters"
 source "drivers/media/pci/b2c2/Kconfig"
-
-comment "Supported BT878 Adapters"
-source "drivers/media/pci/bt8xx/Kconfig"
-
-comment "Supported Pluto2 Adapters"
 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
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
@@ -4,11 +4,20 @@
 
 obj-y        :=	ttpci/		\
 		b2c2/		\
-		bt8xx/		\
 		pluto2/		\
 		dm1105/		\
 		pt1/		\
 		mantis/		\
 		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/
diff --git a/drivers/media/video/cx18/Kconfig → drivers/media/pci/cx18/Kconfig b/drivers/media/video/cx18/Kconfig → drivers/media/pci/cx18/Kconfig
diff --git a/drivers/media/video/cx18/Makefile → drivers/media/pci/cx18/Makefile b/drivers/media/video/cx18/Makefile → drivers/media/pci/cx18/Makefile
diff --git a/drivers/media/video/cx18/cx18-alsa-main.c → drivers/media/pci/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c → drivers/media/pci/cx18/cx18-alsa-main.c
diff --git a/drivers/media/video/cx18/cx18-alsa-mixer.c → drivers/media/pci/cx18/cx18-alsa-mixer.c b/drivers/media/video/cx18/cx18-alsa-mixer.c → drivers/media/pci/cx18/cx18-alsa-mixer.c
diff --git a/drivers/media/video/cx18/cx18-alsa-mixer.h → drivers/media/pci/cx18/cx18-alsa-mixer.h b/drivers/media/video/cx18/cx18-alsa-mixer.h → drivers/media/pci/cx18/cx18-alsa-mixer.h
diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c → drivers/media/pci/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c → drivers/media/pci/cx18/cx18-alsa-pcm.c
diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.h → drivers/media/pci/cx18/cx18-alsa-pcm.h b/drivers/media/video/cx18/cx18-alsa-pcm.h → drivers/media/pci/cx18/cx18-alsa-pcm.h
diff --git a/drivers/media/video/cx18/cx18-alsa.h → drivers/media/pci/cx18/cx18-alsa.h b/drivers/media/video/cx18/cx18-alsa.h → drivers/media/pci/cx18/cx18-alsa.h
diff --git a/drivers/media/video/cx18/cx18-audio.c → drivers/media/pci/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c → drivers/media/pci/cx18/cx18-audio.c
diff --git a/drivers/media/video/cx18/cx18-audio.h → drivers/media/pci/cx18/cx18-audio.h b/drivers/media/video/cx18/cx18-audio.h → drivers/media/pci/cx18/cx18-audio.h
diff --git a/drivers/media/video/cx18/cx18-av-audio.c → drivers/media/pci/cx18/cx18-av-audio.c b/drivers/media/video/cx18/cx18-av-audio.c → drivers/media/pci/cx18/cx18-av-audio.c
diff --git a/drivers/media/video/cx18/cx18-av-core.c → drivers/media/pci/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c → drivers/media/pci/cx18/cx18-av-core.c
diff --git a/drivers/media/video/cx18/cx18-av-core.h → drivers/media/pci/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h → drivers/media/pci/cx18/cx18-av-core.h
diff --git a/drivers/media/video/cx18/cx18-av-firmware.c → drivers/media/pci/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c → drivers/media/pci/cx18/cx18-av-firmware.c
diff --git a/drivers/media/video/cx18/cx18-av-vbi.c → drivers/media/pci/cx18/cx18-av-vbi.c b/drivers/media/video/cx18/cx18-av-vbi.c → drivers/media/pci/cx18/cx18-av-vbi.c
diff --git a/drivers/media/video/cx18/cx18-cards.c → drivers/media/pci/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c → drivers/media/pci/cx18/cx18-cards.c
diff --git a/drivers/media/video/cx18/cx18-cards.h → drivers/media/pci/cx18/cx18-cards.h b/drivers/media/video/cx18/cx18-cards.h → drivers/media/pci/cx18/cx18-cards.h
diff --git a/drivers/media/video/cx18/cx18-controls.c → drivers/media/pci/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c → drivers/media/pci/cx18/cx18-controls.c
diff --git a/drivers/media/video/cx18/cx18-controls.h → drivers/media/pci/cx18/cx18-controls.h b/drivers/media/video/cx18/cx18-controls.h → drivers/media/pci/cx18/cx18-controls.h
diff --git a/drivers/media/video/cx18/cx18-driver.c → drivers/media/pci/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c → drivers/media/pci/cx18/cx18-driver.c
diff --git a/drivers/media/video/cx18/cx18-driver.h → drivers/media/pci/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h → drivers/media/pci/cx18/cx18-driver.h
diff --git a/drivers/media/video/cx18/cx18-dvb.c → drivers/media/pci/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c → drivers/media/pci/cx18/cx18-dvb.c
diff --git a/drivers/media/video/cx18/cx18-dvb.h → drivers/media/pci/cx18/cx18-dvb.h b/drivers/media/video/cx18/cx18-dvb.h → drivers/media/pci/cx18/cx18-dvb.h
diff --git a/drivers/media/video/cx18/cx18-fileops.c → drivers/media/pci/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c → drivers/media/pci/cx18/cx18-fileops.c
diff --git a/drivers/media/video/cx18/cx18-fileops.h → drivers/media/pci/cx18/cx18-fileops.h b/drivers/media/video/cx18/cx18-fileops.h → drivers/media/pci/cx18/cx18-fileops.h
diff --git a/drivers/media/video/cx18/cx18-firmware.c → drivers/media/pci/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c → drivers/media/pci/cx18/cx18-firmware.c
diff --git a/drivers/media/video/cx18/cx18-firmware.h → drivers/media/pci/cx18/cx18-firmware.h b/drivers/media/video/cx18/cx18-firmware.h → drivers/media/pci/cx18/cx18-firmware.h
diff --git a/drivers/media/video/cx18/cx18-gpio.c → drivers/media/pci/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c → drivers/media/pci/cx18/cx18-gpio.c
diff --git a/drivers/media/video/cx18/cx18-gpio.h → drivers/media/pci/cx18/cx18-gpio.h b/drivers/media/video/cx18/cx18-gpio.h → drivers/media/pci/cx18/cx18-gpio.h
diff --git a/drivers/media/video/cx18/cx18-i2c.c → drivers/media/pci/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c → drivers/media/pci/cx18/cx18-i2c.c
diff --git a/drivers/media/video/cx18/cx18-i2c.h → drivers/media/pci/cx18/cx18-i2c.h b/drivers/media/video/cx18/cx18-i2c.h → drivers/media/pci/cx18/cx18-i2c.h
diff --git a/drivers/media/video/cx18/cx18-io.c → drivers/media/pci/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c → drivers/media/pci/cx18/cx18-io.c
diff --git a/drivers/media/video/cx18/cx18-io.h → drivers/media/pci/cx18/cx18-io.h b/drivers/media/video/cx18/cx18-io.h → drivers/media/pci/cx18/cx18-io.h
diff --git a/drivers/media/video/cx18/cx18-ioctl.c → drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c → drivers/media/pci/cx18/cx18-ioctl.c
diff --git a/drivers/media/video/cx18/cx18-ioctl.h → drivers/media/pci/cx18/cx18-ioctl.h b/drivers/media/video/cx18/cx18-ioctl.h → drivers/media/pci/cx18/cx18-ioctl.h
diff --git a/drivers/media/video/cx18/cx18-irq.c → drivers/media/pci/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c → drivers/media/pci/cx18/cx18-irq.c
diff --git a/drivers/media/video/cx18/cx18-irq.h → drivers/media/pci/cx18/cx18-irq.h b/drivers/media/video/cx18/cx18-irq.h → drivers/media/pci/cx18/cx18-irq.h
diff --git a/drivers/media/video/cx18/cx18-mailbox.c → drivers/media/pci/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c → drivers/media/pci/cx18/cx18-mailbox.c
diff --git a/drivers/media/video/cx18/cx18-mailbox.h → drivers/media/pci/cx18/cx18-mailbox.h b/drivers/media/video/cx18/cx18-mailbox.h → drivers/media/pci/cx18/cx18-mailbox.h
diff --git a/drivers/media/video/cx18/cx18-queue.c → drivers/media/pci/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c → drivers/media/pci/cx18/cx18-queue.c
diff --git a/drivers/media/video/cx18/cx18-queue.h → drivers/media/pci/cx18/cx18-queue.h b/drivers/media/video/cx18/cx18-queue.h → drivers/media/pci/cx18/cx18-queue.h
diff --git a/drivers/media/video/cx18/cx18-scb.c → drivers/media/pci/cx18/cx18-scb.c b/drivers/media/video/cx18/cx18-scb.c → drivers/media/pci/cx18/cx18-scb.c
diff --git a/drivers/media/video/cx18/cx18-scb.h → drivers/media/pci/cx18/cx18-scb.h b/drivers/media/video/cx18/cx18-scb.h → drivers/media/pci/cx18/cx18-scb.h
diff --git a/drivers/media/video/cx18/cx18-streams.c → drivers/media/pci/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c → drivers/media/pci/cx18/cx18-streams.c
diff --git a/drivers/media/video/cx18/cx18-streams.h → drivers/media/pci/cx18/cx18-streams.h b/drivers/media/video/cx18/cx18-streams.h → drivers/media/pci/cx18/cx18-streams.h
diff --git a/drivers/media/video/cx18/cx18-vbi.c → drivers/media/pci/cx18/cx18-vbi.c b/drivers/media/video/cx18/cx18-vbi.c → drivers/media/pci/cx18/cx18-vbi.c
diff --git a/drivers/media/video/cx18/cx18-vbi.h → drivers/media/pci/cx18/cx18-vbi.h b/drivers/media/video/cx18/cx18-vbi.h → drivers/media/pci/cx18/cx18-vbi.h
diff --git a/drivers/media/video/cx18/cx18-version.h → drivers/media/pci/cx18/cx18-version.h b/drivers/media/video/cx18/cx18-version.h → drivers/media/pci/cx18/cx18-version.h
diff --git a/drivers/media/video/cx18/cx18-video.c → drivers/media/pci/cx18/cx18-video.c b/drivers/media/video/cx18/cx18-video.c → drivers/media/pci/cx18/cx18-video.c
diff --git a/drivers/media/video/cx18/cx18-video.h → drivers/media/pci/cx18/cx18-video.h b/drivers/media/video/cx18/cx18-video.h → drivers/media/pci/cx18/cx18-video.h
diff --git a/drivers/media/video/cx18/cx23418.h → drivers/media/pci/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h → drivers/media/pci/cx18/cx23418.h
diff --git a/drivers/media/video/cx23885/Kconfig → drivers/media/pci/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig → drivers/media/pci/cx23885/Kconfig
diff --git a/drivers/media/video/cx23885/Makefile → drivers/media/pci/cx23885/Makefile b/drivers/media/video/cx23885/Makefile → drivers/media/pci/cx23885/Makefile
diff --git a/drivers/media/video/cx23885/altera-ci.c → drivers/media/pci/cx23885/altera-ci.c b/drivers/media/video/cx23885/altera-ci.c → drivers/media/pci/cx23885/altera-ci.c
diff --git a/drivers/media/video/cx23885/altera-ci.h → drivers/media/pci/cx23885/altera-ci.h b/drivers/media/video/cx23885/altera-ci.h → drivers/media/pci/cx23885/altera-ci.h
diff --git a/drivers/media/video/cx23885/cimax2.c → drivers/media/pci/cx23885/cimax2.c b/drivers/media/video/cx23885/cimax2.c → drivers/media/pci/cx23885/cimax2.c
diff --git a/drivers/media/video/cx23885/cimax2.h → drivers/media/pci/cx23885/cimax2.h b/drivers/media/video/cx23885/cimax2.h → drivers/media/pci/cx23885/cimax2.h
diff --git a/drivers/media/video/cx23885/cx23885-417.c → drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c → drivers/media/pci/cx23885/cx23885-417.c
diff --git a/drivers/media/video/cx23885/cx23885-alsa.c → drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/video/cx23885/cx23885-alsa.c → drivers/media/pci/cx23885/cx23885-alsa.c
diff --git a/drivers/media/video/cx23885/cx23885-av.c → drivers/media/pci/cx23885/cx23885-av.c b/drivers/media/video/cx23885/cx23885-av.c → drivers/media/pci/cx23885/cx23885-av.c
diff --git a/drivers/media/video/cx23885/cx23885-av.h → drivers/media/pci/cx23885/cx23885-av.h b/drivers/media/video/cx23885/cx23885-av.h → drivers/media/pci/cx23885/cx23885-av.h
diff --git a/drivers/media/video/cx23885/cx23885-cards.c → drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c → drivers/media/pci/cx23885/cx23885-cards.c
diff --git a/drivers/media/video/cx23885/cx23885-core.c → drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c → drivers/media/pci/cx23885/cx23885-core.c
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c → drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c → drivers/media/pci/cx23885/cx23885-dvb.c
diff --git a/drivers/media/video/cx23885/cx23885-f300.c → drivers/media/pci/cx23885/cx23885-f300.c b/drivers/media/video/cx23885/cx23885-f300.c → drivers/media/pci/cx23885/cx23885-f300.c
diff --git a/drivers/media/video/cx23885/cx23885-f300.h → drivers/media/pci/cx23885/cx23885-f300.h b/drivers/media/video/cx23885/cx23885-f300.h → drivers/media/pci/cx23885/cx23885-f300.h
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c → drivers/media/pci/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c → drivers/media/pci/cx23885/cx23885-i2c.c
diff --git a/drivers/media/video/cx23885/cx23885-input.c → drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c → drivers/media/pci/cx23885/cx23885-input.c
diff --git a/drivers/media/video/cx23885/cx23885-input.h → drivers/media/pci/cx23885/cx23885-input.h b/drivers/media/video/cx23885/cx23885-input.h → drivers/media/pci/cx23885/cx23885-input.h
diff --git a/drivers/media/video/cx23885/cx23885-ioctl.c → drivers/media/pci/cx23885/cx23885-ioctl.c b/drivers/media/video/cx23885/cx23885-ioctl.c → drivers/media/pci/cx23885/cx23885-ioctl.c
diff --git a/drivers/media/video/cx23885/cx23885-ioctl.h → drivers/media/pci/cx23885/cx23885-ioctl.h b/drivers/media/video/cx23885/cx23885-ioctl.h → drivers/media/pci/cx23885/cx23885-ioctl.h
diff --git a/drivers/media/video/cx23885/cx23885-ir.c → drivers/media/pci/cx23885/cx23885-ir.c b/drivers/media/video/cx23885/cx23885-ir.c → drivers/media/pci/cx23885/cx23885-ir.c
diff --git a/drivers/media/video/cx23885/cx23885-ir.h → drivers/media/pci/cx23885/cx23885-ir.h b/drivers/media/video/cx23885/cx23885-ir.h → drivers/media/pci/cx23885/cx23885-ir.h
diff --git a/drivers/media/video/cx23885/cx23885-reg.h → drivers/media/pci/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h → drivers/media/pci/cx23885/cx23885-reg.h
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c → drivers/media/pci/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c → drivers/media/pci/cx23885/cx23885-vbi.c
diff --git a/drivers/media/video/cx23885/cx23885-video.c → drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c → drivers/media/pci/cx23885/cx23885-video.c
diff --git a/drivers/media/video/cx23885/cx23885.h → drivers/media/pci/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h → drivers/media/pci/cx23885/cx23885.h
diff --git a/drivers/media/video/cx23885/cx23888-ir.c → drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c → drivers/media/pci/cx23885/cx23888-ir.c
diff --git a/drivers/media/video/cx23885/cx23888-ir.h → drivers/media/pci/cx23885/cx23888-ir.h b/drivers/media/video/cx23885/cx23888-ir.h → drivers/media/pci/cx23885/cx23888-ir.h
diff --git a/drivers/media/video/cx23885/netup-eeprom.c → drivers/media/pci/cx23885/netup-eeprom.c b/drivers/media/video/cx23885/netup-eeprom.c → drivers/media/pci/cx23885/netup-eeprom.c
diff --git a/drivers/media/video/cx23885/netup-eeprom.h → drivers/media/pci/cx23885/netup-eeprom.h b/drivers/media/video/cx23885/netup-eeprom.h → drivers/media/pci/cx23885/netup-eeprom.h
diff --git a/drivers/media/video/cx23885/netup-init.c → drivers/media/pci/cx23885/netup-init.c b/drivers/media/video/cx23885/netup-init.c → drivers/media/pci/cx23885/netup-init.c
diff --git a/drivers/media/video/cx23885/netup-init.h → drivers/media/pci/cx23885/netup-init.h b/drivers/media/video/cx23885/netup-init.h → drivers/media/pci/cx23885/netup-init.h
diff --git a/drivers/media/video/cx25821/Kconfig → drivers/media/pci/cx25821/Kconfig b/drivers/media/video/cx25821/Kconfig → drivers/media/pci/cx25821/Kconfig
diff --git a/drivers/media/video/cx25821/Makefile → drivers/media/pci/cx25821/Makefile b/drivers/media/video/cx25821/Makefile → drivers/media/pci/cx25821/Makefile
diff --git a/drivers/media/video/cx25821/cx25821-alsa.c → drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/video/cx25821/cx25821-alsa.c → drivers/media/pci/cx25821/cx25821-alsa.c
diff --git a/...ia/video/cx25821/cx25821-audio-upstream.c → ...edia/pci/cx25821/cx25821-audio-upstream.c b/...ia/video/cx25821/cx25821-audio-upstream.c → ...edia/pci/cx25821/cx25821-audio-upstream.c
diff --git a/...ia/video/cx25821/cx25821-audio-upstream.h → ...edia/pci/cx25821/cx25821-audio-upstream.h b/...ia/video/cx25821/cx25821-audio-upstream.h → ...edia/pci/cx25821/cx25821-audio-upstream.h
diff --git a/drivers/media/video/cx25821/cx25821-audio.h → drivers/media/pci/cx25821/cx25821-audio.h b/drivers/media/video/cx25821/cx25821-audio.h → drivers/media/pci/cx25821/cx25821-audio.h
diff --git a/...rs/media/video/cx25821/cx25821-biffuncs.h → drivers/media/pci/cx25821/cx25821-biffuncs.h b/...rs/media/video/cx25821/cx25821-biffuncs.h → drivers/media/pci/cx25821/cx25821-biffuncs.h
diff --git a/drivers/media/video/cx25821/cx25821-cards.c → drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/video/cx25821/cx25821-cards.c → drivers/media/pci/cx25821/cx25821-cards.c
diff --git a/drivers/media/video/cx25821/cx25821-core.c → drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c → drivers/media/pci/cx25821/cx25821-core.c
diff --git a/drivers/media/video/cx25821/cx25821-gpio.c → drivers/media/pci/cx25821/cx25821-gpio.c b/drivers/media/video/cx25821/cx25821-gpio.c → drivers/media/pci/cx25821/cx25821-gpio.c
diff --git a/drivers/media/video/cx25821/cx25821-i2c.c → drivers/media/pci/cx25821/cx25821-i2c.c b/drivers/media/video/cx25821/cx25821-i2c.c → drivers/media/pci/cx25821/cx25821-i2c.c
diff --git a/...ia/video/cx25821/cx25821-medusa-defines.h → ...edia/pci/cx25821/cx25821-medusa-defines.h b/...ia/video/cx25821/cx25821-medusa-defines.h → ...edia/pci/cx25821/cx25821-medusa-defines.h
diff --git a/.../media/video/cx25821/cx25821-medusa-reg.h → ...rs/media/pci/cx25821/cx25821-medusa-reg.h b/.../media/video/cx25821/cx25821-medusa-reg.h → ...rs/media/pci/cx25821/cx25821-medusa-reg.h
diff --git a/...edia/video/cx25821/cx25821-medusa-video.c → .../media/pci/cx25821/cx25821-medusa-video.c b/...edia/video/cx25821/cx25821-medusa-video.c → .../media/pci/cx25821/cx25821-medusa-video.c
diff --git a/...edia/video/cx25821/cx25821-medusa-video.h → .../media/pci/cx25821/cx25821-medusa-video.h b/...edia/video/cx25821/cx25821-medusa-video.h → .../media/pci/cx25821/cx25821-medusa-video.h
diff --git a/drivers/media/video/cx25821/cx25821-reg.h → drivers/media/pci/cx25821/cx25821-reg.h b/drivers/media/video/cx25821/cx25821-reg.h → drivers/media/pci/cx25821/cx25821-reg.h
diff --git a/drivers/media/video/cx25821/cx25821-sram.h → drivers/media/pci/cx25821/cx25821-sram.h b/drivers/media/video/cx25821/cx25821-sram.h → drivers/media/pci/cx25821/cx25821-sram.h
diff --git a/...ideo/cx25821/cx25821-video-upstream-ch2.c → .../pci/cx25821/cx25821-video-upstream-ch2.c b/...ideo/cx25821/cx25821-video-upstream-ch2.c → .../pci/cx25821/cx25821-video-upstream-ch2.c
diff --git a/...ideo/cx25821/cx25821-video-upstream-ch2.h → .../pci/cx25821/cx25821-video-upstream-ch2.h b/...ideo/cx25821/cx25821-video-upstream-ch2.h → .../pci/cx25821/cx25821-video-upstream-ch2.h
diff --git a/...ia/video/cx25821/cx25821-video-upstream.c → ...edia/pci/cx25821/cx25821-video-upstream.c b/...ia/video/cx25821/cx25821-video-upstream.c → ...edia/pci/cx25821/cx25821-video-upstream.c
diff --git a/...ia/video/cx25821/cx25821-video-upstream.h → ...edia/pci/cx25821/cx25821-video-upstream.h b/...ia/video/cx25821/cx25821-video-upstream.h → ...edia/pci/cx25821/cx25821-video-upstream.h
diff --git a/drivers/media/video/cx25821/cx25821-video.c → drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/video/cx25821/cx25821-video.c → drivers/media/pci/cx25821/cx25821-video.c
diff --git a/drivers/media/video/cx25821/cx25821-video.h → drivers/media/pci/cx25821/cx25821-video.h b/drivers/media/video/cx25821/cx25821-video.h → drivers/media/pci/cx25821/cx25821-video.h
diff --git a/drivers/media/video/cx25821/cx25821.h → drivers/media/pci/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h → drivers/media/pci/cx25821/cx25821.h
diff --git a/drivers/media/video/cx88/Kconfig → drivers/media/pci/cx88/Kconfig b/drivers/media/video/cx88/Kconfig → drivers/media/pci/cx88/Kconfig
diff --git a/drivers/media/video/cx88/Makefile → drivers/media/pci/cx88/Makefile b/drivers/media/video/cx88/Makefile → drivers/media/pci/cx88/Makefile
diff --git a/drivers/media/video/cx88/cx88-alsa.c → drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c → drivers/media/pci/cx88/cx88-alsa.c
diff --git a/drivers/media/video/cx88/cx88-blackbird.c → drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c → drivers/media/pci/cx88/cx88-blackbird.c
diff --git a/drivers/media/video/cx88/cx88-cards.c → drivers/media/pci/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c → drivers/media/pci/cx88/cx88-cards.c
diff --git a/drivers/media/video/cx88/cx88-core.c → drivers/media/pci/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c → drivers/media/pci/cx88/cx88-core.c
diff --git a/drivers/media/video/cx88/cx88-dsp.c → drivers/media/pci/cx88/cx88-dsp.c b/drivers/media/video/cx88/cx88-dsp.c → drivers/media/pci/cx88/cx88-dsp.c
diff --git a/drivers/media/video/cx88/cx88-dvb.c → drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c → drivers/media/pci/cx88/cx88-dvb.c
diff --git a/drivers/media/video/cx88/cx88-i2c.c → drivers/media/pci/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c → drivers/media/pci/cx88/cx88-i2c.c
diff --git a/drivers/media/video/cx88/cx88-input.c → drivers/media/pci/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c → drivers/media/pci/cx88/cx88-input.c
diff --git a/drivers/media/video/cx88/cx88-mpeg.c → drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c → drivers/media/pci/cx88/cx88-mpeg.c
diff --git a/drivers/media/video/cx88/cx88-reg.h → drivers/media/pci/cx88/cx88-reg.h b/drivers/media/video/cx88/cx88-reg.h → drivers/media/pci/cx88/cx88-reg.h
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c → drivers/media/pci/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c → drivers/media/pci/cx88/cx88-tvaudio.c
diff --git a/drivers/media/video/cx88/cx88-vbi.c → drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c → drivers/media/pci/cx88/cx88-vbi.c
diff --git a/drivers/media/video/cx88/cx88-video.c → drivers/media/pci/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c → drivers/media/pci/cx88/cx88-video.c
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c → drivers/media/pci/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c → drivers/media/pci/cx88/cx88-vp3054-i2c.c
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.h → drivers/media/pci/cx88/cx88-vp3054-i2c.h b/drivers/media/video/cx88/cx88-vp3054-i2c.h → drivers/media/pci/cx88/cx88-vp3054-i2c.h
diff --git a/drivers/media/video/cx88/cx88.h → drivers/media/pci/cx88/cx88.h b/drivers/media/video/cx88/cx88.h → drivers/media/pci/cx88/cx88.h
diff --git a/drivers/media/video/ivtv/Kconfig → drivers/media/pci/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig → drivers/media/pci/ivtv/Kconfig
diff --git a/drivers/media/video/ivtv/Makefile → drivers/media/pci/ivtv/Makefile b/drivers/media/video/ivtv/Makefile → drivers/media/pci/ivtv/Makefile
diff --git a/drivers/media/video/ivtv/ivtv-cards.c → drivers/media/pci/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c → drivers/media/pci/ivtv/ivtv-cards.c
diff --git a/drivers/media/video/ivtv/ivtv-cards.h → drivers/media/pci/ivtv/ivtv-cards.h b/drivers/media/video/ivtv/ivtv-cards.h → drivers/media/pci/ivtv/ivtv-cards.h
diff --git a/drivers/media/video/ivtv/ivtv-controls.c → drivers/media/pci/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c → drivers/media/pci/ivtv/ivtv-controls.c
diff --git a/drivers/media/video/ivtv/ivtv-controls.h → drivers/media/pci/ivtv/ivtv-controls.h b/drivers/media/video/ivtv/ivtv-controls.h → drivers/media/pci/ivtv/ivtv-controls.h
diff --git a/drivers/media/video/ivtv/ivtv-driver.c → drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c → drivers/media/pci/ivtv/ivtv-driver.c
diff --git a/drivers/media/video/ivtv/ivtv-driver.h → drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h → drivers/media/pci/ivtv/ivtv-driver.h
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c → drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c → drivers/media/pci/ivtv/ivtv-fileops.c
diff --git a/drivers/media/video/ivtv/ivtv-fileops.h → drivers/media/pci/ivtv/ivtv-fileops.h b/drivers/media/video/ivtv/ivtv-fileops.h → drivers/media/pci/ivtv/ivtv-fileops.h
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c → drivers/media/pci/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c → drivers/media/pci/ivtv/ivtv-firmware.c
diff --git a/drivers/media/video/ivtv/ivtv-firmware.h → drivers/media/pci/ivtv/ivtv-firmware.h b/drivers/media/video/ivtv/ivtv-firmware.h → drivers/media/pci/ivtv/ivtv-firmware.h
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c → drivers/media/pci/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c → drivers/media/pci/ivtv/ivtv-gpio.c
diff --git a/drivers/media/video/ivtv/ivtv-gpio.h → drivers/media/pci/ivtv/ivtv-gpio.h b/drivers/media/video/ivtv/ivtv-gpio.h → drivers/media/pci/ivtv/ivtv-gpio.h
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c → drivers/media/pci/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c → drivers/media/pci/ivtv/ivtv-i2c.c
diff --git a/drivers/media/video/ivtv/ivtv-i2c.h → drivers/media/pci/ivtv/ivtv-i2c.h b/drivers/media/video/ivtv/ivtv-i2c.h → drivers/media/pci/ivtv/ivtv-i2c.h
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c → drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c → drivers/media/pci/ivtv/ivtv-ioctl.c
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.h → drivers/media/pci/ivtv/ivtv-ioctl.h b/drivers/media/video/ivtv/ivtv-ioctl.h → drivers/media/pci/ivtv/ivtv-ioctl.h
diff --git a/drivers/media/video/ivtv/ivtv-irq.c → drivers/media/pci/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c → drivers/media/pci/ivtv/ivtv-irq.c
diff --git a/drivers/media/video/ivtv/ivtv-irq.h → drivers/media/pci/ivtv/ivtv-irq.h b/drivers/media/video/ivtv/ivtv-irq.h → drivers/media/pci/ivtv/ivtv-irq.h
diff --git a/drivers/media/video/ivtv/ivtv-mailbox.c → drivers/media/pci/ivtv/ivtv-mailbox.c b/drivers/media/video/ivtv/ivtv-mailbox.c → drivers/media/pci/ivtv/ivtv-mailbox.c
diff --git a/drivers/media/video/ivtv/ivtv-mailbox.h → drivers/media/pci/ivtv/ivtv-mailbox.h b/drivers/media/video/ivtv/ivtv-mailbox.h → drivers/media/pci/ivtv/ivtv-mailbox.h
diff --git a/drivers/media/video/ivtv/ivtv-queue.c → drivers/media/pci/ivtv/ivtv-queue.c b/drivers/media/video/ivtv/ivtv-queue.c → drivers/media/pci/ivtv/ivtv-queue.c
diff --git a/drivers/media/video/ivtv/ivtv-queue.h → drivers/media/pci/ivtv/ivtv-queue.h b/drivers/media/video/ivtv/ivtv-queue.h → drivers/media/pci/ivtv/ivtv-queue.h
diff --git a/drivers/media/video/ivtv/ivtv-routing.c → drivers/media/pci/ivtv/ivtv-routing.c b/drivers/media/video/ivtv/ivtv-routing.c → drivers/media/pci/ivtv/ivtv-routing.c
diff --git a/drivers/media/video/ivtv/ivtv-routing.h → drivers/media/pci/ivtv/ivtv-routing.h b/drivers/media/video/ivtv/ivtv-routing.h → drivers/media/pci/ivtv/ivtv-routing.h
diff --git a/drivers/media/video/ivtv/ivtv-streams.c → drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c → drivers/media/pci/ivtv/ivtv-streams.c
diff --git a/drivers/media/video/ivtv/ivtv-streams.h → drivers/media/pci/ivtv/ivtv-streams.h b/drivers/media/video/ivtv/ivtv-streams.h → drivers/media/pci/ivtv/ivtv-streams.h
diff --git a/drivers/media/video/ivtv/ivtv-udma.c → drivers/media/pci/ivtv/ivtv-udma.c b/drivers/media/video/ivtv/ivtv-udma.c → drivers/media/pci/ivtv/ivtv-udma.c
diff --git a/drivers/media/video/ivtv/ivtv-udma.h → drivers/media/pci/ivtv/ivtv-udma.h b/drivers/media/video/ivtv/ivtv-udma.h → drivers/media/pci/ivtv/ivtv-udma.h
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c → drivers/media/pci/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c → drivers/media/pci/ivtv/ivtv-vbi.c
diff --git a/drivers/media/video/ivtv/ivtv-vbi.h → drivers/media/pci/ivtv/ivtv-vbi.h b/drivers/media/video/ivtv/ivtv-vbi.h → drivers/media/pci/ivtv/ivtv-vbi.h
diff --git a/drivers/media/video/ivtv/ivtv-version.h → drivers/media/pci/ivtv/ivtv-version.h b/drivers/media/video/ivtv/ivtv-version.h → drivers/media/pci/ivtv/ivtv-version.h
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c → drivers/media/pci/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c → drivers/media/pci/ivtv/ivtv-yuv.c
diff --git a/drivers/media/video/ivtv/ivtv-yuv.h → drivers/media/pci/ivtv/ivtv-yuv.h b/drivers/media/video/ivtv/ivtv-yuv.h → drivers/media/pci/ivtv/ivtv-yuv.h
diff --git a/drivers/media/video/ivtv/ivtvfb.c → drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c → drivers/media/pci/ivtv/ivtvfb.c
diff --git a/drivers/media/video/saa7134/Kconfig → drivers/media/pci/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig → drivers/media/pci/saa7134/Kconfig
diff --git a/drivers/media/video/saa7134/Makefile → drivers/media/pci/saa7134/Makefile b/drivers/media/video/saa7134/Makefile → drivers/media/pci/saa7134/Makefile
diff --git a/drivers/media/video/saa7134/saa6752hs.c → drivers/media/pci/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c → drivers/media/pci/saa7134/saa6752hs.c
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c → drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c → drivers/media/pci/saa7134/saa7134-alsa.c
diff --git a/drivers/media/video/saa7134/saa7134-cards.c → drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c → drivers/media/pci/saa7134/saa7134-cards.c
diff --git a/drivers/media/video/saa7134/saa7134-core.c → drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c → drivers/media/pci/saa7134/saa7134-core.c
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c → drivers/media/pci/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c → drivers/media/pci/saa7134/saa7134-dvb.c
diff --git a/...ers/media/video/saa7134/saa7134-empress.c → drivers/media/pci/saa7134/saa7134-empress.c b/...ers/media/video/saa7134/saa7134-empress.c → drivers/media/pci/saa7134/saa7134-empress.c
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c → drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c → drivers/media/pci/saa7134/saa7134-i2c.c
diff --git a/drivers/media/video/saa7134/saa7134-input.c → drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c → drivers/media/pci/saa7134/saa7134-input.c
diff --git a/drivers/media/video/saa7134/saa7134-reg.h → drivers/media/pci/saa7134/saa7134-reg.h b/drivers/media/video/saa7134/saa7134-reg.h → drivers/media/pci/saa7134/saa7134-reg.h
diff --git a/drivers/media/video/saa7134/saa7134-ts.c → drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c → drivers/media/pci/saa7134/saa7134-ts.c
diff --git a/...ers/media/video/saa7134/saa7134-tvaudio.c → drivers/media/pci/saa7134/saa7134-tvaudio.c b/...ers/media/video/saa7134/saa7134-tvaudio.c → drivers/media/pci/saa7134/saa7134-tvaudio.c
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c → drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c → drivers/media/pci/saa7134/saa7134-vbi.c
diff --git a/drivers/media/video/saa7134/saa7134-video.c → drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c → drivers/media/pci/saa7134/saa7134-video.c
diff --git a/drivers/media/video/saa7134/saa7134.h → drivers/media/pci/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h → drivers/media/pci/saa7134/saa7134.h
diff --git a/drivers/media/video/saa7164/Kconfig → drivers/media/pci/saa7164/Kconfig b/drivers/media/video/saa7164/Kconfig → drivers/media/pci/saa7164/Kconfig
diff --git a/drivers/media/video/saa7164/Makefile → drivers/media/pci/saa7164/Makefile b/drivers/media/video/saa7164/Makefile → drivers/media/pci/saa7164/Makefile
diff --git a/drivers/media/video/saa7164/saa7164-api.c → drivers/media/pci/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c → drivers/media/pci/saa7164/saa7164-api.c
diff --git a/drivers/media/video/saa7164/saa7164-buffer.c → drivers/media/pci/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c → drivers/media/pci/saa7164/saa7164-buffer.c
diff --git a/drivers/media/video/saa7164/saa7164-bus.c → drivers/media/pci/saa7164/saa7164-bus.c b/drivers/media/video/saa7164/saa7164-bus.c → drivers/media/pci/saa7164/saa7164-bus.c
diff --git a/drivers/media/video/saa7164/saa7164-cards.c → drivers/media/pci/saa7164/saa7164-cards.c b/drivers/media/video/saa7164/saa7164-cards.c → drivers/media/pci/saa7164/saa7164-cards.c
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c → drivers/media/pci/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c → drivers/media/pci/saa7164/saa7164-cmd.c
diff --git a/drivers/media/video/saa7164/saa7164-core.c → drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c → drivers/media/pci/saa7164/saa7164-core.c
diff --git a/drivers/media/video/saa7164/saa7164-dvb.c → drivers/media/pci/saa7164/saa7164-dvb.c b/drivers/media/video/saa7164/saa7164-dvb.c → drivers/media/pci/saa7164/saa7164-dvb.c
diff --git a/...ers/media/video/saa7164/saa7164-encoder.c → drivers/media/pci/saa7164/saa7164-encoder.c b/...ers/media/video/saa7164/saa7164-encoder.c → drivers/media/pci/saa7164/saa7164-encoder.c
diff --git a/drivers/media/video/saa7164/saa7164-fw.c → drivers/media/pci/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c → drivers/media/pci/saa7164/saa7164-fw.c
diff --git a/drivers/media/video/saa7164/saa7164-i2c.c → drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/video/saa7164/saa7164-i2c.c → drivers/media/pci/saa7164/saa7164-i2c.c
diff --git a/drivers/media/video/saa7164/saa7164-reg.h → drivers/media/pci/saa7164/saa7164-reg.h b/drivers/media/video/saa7164/saa7164-reg.h → drivers/media/pci/saa7164/saa7164-reg.h
diff --git a/drivers/media/video/saa7164/saa7164-types.h → drivers/media/pci/saa7164/saa7164-types.h b/drivers/media/video/saa7164/saa7164-types.h → drivers/media/pci/saa7164/saa7164-types.h
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c → drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c → drivers/media/pci/saa7164/saa7164-vbi.c
diff --git a/drivers/media/video/saa7164/saa7164.h → drivers/media/pci/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h → drivers/media/pci/saa7164/saa7164.h
diff --git a/drivers/media/video/zoran/Kconfig → drivers/media/pci/zoran/Kconfig b/drivers/media/video/zoran/Kconfig → drivers/media/pci/zoran/Kconfig
diff --git a/drivers/media/video/zoran/Makefile → drivers/media/pci/zoran/Makefile b/drivers/media/video/zoran/Makefile → drivers/media/pci/zoran/Makefile
diff --git a/drivers/media/video/zoran/videocodec.c → drivers/media/pci/zoran/videocodec.c b/drivers/media/video/zoran/videocodec.c → drivers/media/pci/zoran/videocodec.c
diff --git a/drivers/media/video/zoran/videocodec.h → drivers/media/pci/zoran/videocodec.h b/drivers/media/video/zoran/videocodec.h → drivers/media/pci/zoran/videocodec.h
diff --git a/drivers/media/video/zoran/zoran.h → drivers/media/pci/zoran/zoran.h b/drivers/media/video/zoran/zoran.h → drivers/media/pci/zoran/zoran.h
diff --git a/drivers/media/video/zoran/zoran_card.c → drivers/media/pci/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c → drivers/media/pci/zoran/zoran_card.c
diff --git a/drivers/media/video/zoran/zoran_card.h → drivers/media/pci/zoran/zoran_card.h b/drivers/media/video/zoran/zoran_card.h → drivers/media/pci/zoran/zoran_card.h
diff --git a/drivers/media/video/zoran/zoran_device.c → drivers/media/pci/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c → drivers/media/pci/zoran/zoran_device.c
diff --git a/drivers/media/video/zoran/zoran_device.h → drivers/media/pci/zoran/zoran_device.h b/drivers/media/video/zoran/zoran_device.h → drivers/media/pci/zoran/zoran_device.h
diff --git a/drivers/media/video/zoran/zoran_driver.c → drivers/media/pci/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c → drivers/media/pci/zoran/zoran_driver.c
diff --git a/drivers/media/video/zoran/zoran_procfs.c → drivers/media/pci/zoran/zoran_procfs.c b/drivers/media/video/zoran/zoran_procfs.c → drivers/media/pci/zoran/zoran_procfs.c
diff --git a/drivers/media/video/zoran/zoran_procfs.h → drivers/media/pci/zoran/zoran_procfs.h b/drivers/media/video/zoran/zoran_procfs.h → drivers/media/pci/zoran/zoran_procfs.h
diff --git a/drivers/media/video/zoran/zr36016.c → drivers/media/pci/zoran/zr36016.c b/drivers/media/video/zoran/zr36016.c → drivers/media/pci/zoran/zr36016.c
diff --git a/drivers/media/video/zoran/zr36016.h → drivers/media/pci/zoran/zr36016.h b/drivers/media/video/zoran/zr36016.h → drivers/media/pci/zoran/zr36016.h
diff --git a/drivers/media/video/zoran/zr36050.c → drivers/media/pci/zoran/zr36050.c b/drivers/media/video/zoran/zr36050.c → drivers/media/pci/zoran/zr36050.c
diff --git a/drivers/media/video/zoran/zr36050.h → drivers/media/pci/zoran/zr36050.h b/drivers/media/video/zoran/zr36050.h → drivers/media/pci/zoran/zr36050.h
diff --git a/drivers/media/video/zoran/zr36057.h → drivers/media/pci/zoran/zr36057.h b/drivers/media/video/zoran/zr36057.h → drivers/media/pci/zoran/zr36057.h
diff --git a/drivers/media/video/zoran/zr36060.c → drivers/media/pci/zoran/zr36060.c b/drivers/media/video/zoran/zr36060.c → drivers/media/pci/zoran/zr36060.c
diff --git a/drivers/media/video/zoran/zr36060.h → drivers/media/pci/zoran/zr36060.h b/drivers/media/video/zoran/zr36060.h → drivers/media/pci/zoran/zr36060.h
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
@@ -619,14 +619,6 @@ menuconfig V4L_PCI_DRIVERS
 
 if V4L_PCI_DRIVERS
 
-source "drivers/media/video/cx18/Kconfig"
-
-source "drivers/media/video/cx23885/Kconfig"
-
-source "drivers/media/video/cx25821/Kconfig"
-
-source "drivers/media/video/cx88/Kconfig"
-
 config VIDEO_HEXIUM_GEMINI
 	tristate "Hexium Gemini frame grabber"
 	depends on PCI && VIDEO_V4L2 && I2C
@@ -650,8 +642,6 @@ config VIDEO_HEXIUM_ORION
 	  To compile this driver as a module, choose M here: the
 	  module will be called hexium_orion.
 
-source "drivers/media/video/ivtv/Kconfig"
-
 config VIDEO_MEYE
 	tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
 	depends on PCI && SONY_LAPTOP && VIDEO_V4L2
@@ -682,11 +672,6 @@ config VIDEO_MXB
 	  To compile this driver as a module, choose M here: the
 	  module will be called mxb.
 
-source "drivers/media/video/saa7134/Kconfig"
-
-source "drivers/media/video/saa7164/Kconfig"
-
-source "drivers/media/video/zoran/Kconfig"
 
 config STA2X11_VIP
 	tristate "STA2X11 VIP Video For Linux"

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
@@ -87,16 +87,12 @@ obj-$(CONFIG_SOC_CAMERA_TW9910)		+= tw9910.o
 
 # And now the v4l2 drivers:
 
-obj-$(CONFIG_VIDEO_ZORAN) += zoran/
 obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o
 obj-$(CONFIG_VIDEO_BWQCAM) += bw-qcam.o
 obj-$(CONFIG_VIDEO_W9966) += w9966.o
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_VINO) += vino.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
-obj-$(CONFIG_VIDEO_CX88) += cx88/
-obj-$(CONFIG_VIDEO_CX25821) += cx25821/
 obj-$(CONFIG_VIDEO_MXB) += mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
 obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
@@ -116,13 +112,9 @@ obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
 
 obj-$(CONFIG_VIDEO_OMAP3)	+= omap3isp/
 
-obj-$(CONFIG_VIDEO_IVTV) += ivtv/
-obj-$(CONFIG_VIDEO_CX18) += cx18/
-
 obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
-obj-$(CONFIG_VIDEO_CX23885) += cx23885/
 
 obj-$(CONFIG_VIDEO_AK881X)		+= ak881x.o
 
@@ -157,8 +149,6 @@ obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/
 
 obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
 
-obj-$(CONFIG_VIDEO_SAA7164)     += saa7164/
-
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 
 obj-y	+= davinci/