Browse Source

[media] Rename media/dvb as media/pci

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

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Mauro Carvalho Chehab 13 years ago
parent
commit
25aee3debe
100 changed files with 12 additions and 12 deletions
  1. 1 1
      Documentation/DocBook/media/dvb/kdapi.xml
  2. 1 1
      drivers/media/Kconfig
  3. 1 1
      drivers/media/Makefile
  4. 9 9
      drivers/media/pci/Kconfig
  5. 0 0
      drivers/media/pci/Makefile
  6. 0 0
      drivers/media/pci/b2c2/Kconfig
  7. 0 0
      drivers/media/pci/b2c2/Makefile
  8. 0 0
      drivers/media/pci/b2c2/flexcop-common.h
  9. 0 0
      drivers/media/pci/b2c2/flexcop-dma.c
  10. 0 0
      drivers/media/pci/b2c2/flexcop-eeprom.c
  11. 0 0
      drivers/media/pci/b2c2/flexcop-fe-tuner.c
  12. 0 0
      drivers/media/pci/b2c2/flexcop-hw-filter.c
  13. 0 0
      drivers/media/pci/b2c2/flexcop-i2c.c
  14. 0 0
      drivers/media/pci/b2c2/flexcop-misc.c
  15. 0 0
      drivers/media/pci/b2c2/flexcop-pci.c
  16. 0 0
      drivers/media/pci/b2c2/flexcop-reg.h
  17. 0 0
      drivers/media/pci/b2c2/flexcop-sram.c
  18. 0 0
      drivers/media/pci/b2c2/flexcop-usb.c
  19. 0 0
      drivers/media/pci/b2c2/flexcop-usb.h
  20. 0 0
      drivers/media/pci/b2c2/flexcop.c
  21. 0 0
      drivers/media/pci/b2c2/flexcop.h
  22. 0 0
      drivers/media/pci/b2c2/flexcop_ibi_value_be.h
  23. 0 0
      drivers/media/pci/b2c2/flexcop_ibi_value_le.h
  24. 0 0
      drivers/media/pci/bt8xx/Kconfig
  25. 0 0
      drivers/media/pci/bt8xx/Makefile
  26. 0 0
      drivers/media/pci/bt8xx/bt878.c
  27. 0 0
      drivers/media/pci/bt8xx/bt878.h
  28. 0 0
      drivers/media/pci/bt8xx/dst.c
  29. 0 0
      drivers/media/pci/bt8xx/dst_ca.c
  30. 0 0
      drivers/media/pci/bt8xx/dst_ca.h
  31. 0 0
      drivers/media/pci/bt8xx/dst_common.h
  32. 0 0
      drivers/media/pci/bt8xx/dst_priv.h
  33. 0 0
      drivers/media/pci/bt8xx/dvb-bt8xx.c
  34. 0 0
      drivers/media/pci/bt8xx/dvb-bt8xx.h
  35. 0 0
      drivers/media/pci/ddbridge/Kconfig
  36. 0 0
      drivers/media/pci/ddbridge/Makefile
  37. 0 0
      drivers/media/pci/ddbridge/ddbridge-core.c
  38. 0 0
      drivers/media/pci/ddbridge/ddbridge-regs.h
  39. 0 0
      drivers/media/pci/ddbridge/ddbridge.h
  40. 0 0
      drivers/media/pci/dm1105/Kconfig
  41. 0 0
      drivers/media/pci/dm1105/Makefile
  42. 0 0
      drivers/media/pci/dm1105/dm1105.c
  43. 0 0
      drivers/media/pci/mantis/Kconfig
  44. 0 0
      drivers/media/pci/mantis/Makefile
  45. 0 0
      drivers/media/pci/mantis/hopper_cards.c
  46. 0 0
      drivers/media/pci/mantis/hopper_vp3028.c
  47. 0 0
      drivers/media/pci/mantis/hopper_vp3028.h
  48. 0 0
      drivers/media/pci/mantis/mantis_ca.c
  49. 0 0
      drivers/media/pci/mantis/mantis_ca.h
  50. 0 0
      drivers/media/pci/mantis/mantis_cards.c
  51. 0 0
      drivers/media/pci/mantis/mantis_common.h
  52. 0 0
      drivers/media/pci/mantis/mantis_core.c
  53. 0 0
      drivers/media/pci/mantis/mantis_core.h
  54. 0 0
      drivers/media/pci/mantis/mantis_dma.c
  55. 0 0
      drivers/media/pci/mantis/mantis_dma.h
  56. 0 0
      drivers/media/pci/mantis/mantis_dvb.c
  57. 0 0
      drivers/media/pci/mantis/mantis_dvb.h
  58. 0 0
      drivers/media/pci/mantis/mantis_evm.c
  59. 0 0
      drivers/media/pci/mantis/mantis_hif.c
  60. 0 0
      drivers/media/pci/mantis/mantis_hif.h
  61. 0 0
      drivers/media/pci/mantis/mantis_i2c.c
  62. 0 0
      drivers/media/pci/mantis/mantis_i2c.h
  63. 0 0
      drivers/media/pci/mantis/mantis_input.c
  64. 0 0
      drivers/media/pci/mantis/mantis_ioc.c
  65. 0 0
      drivers/media/pci/mantis/mantis_ioc.h
  66. 0 0
      drivers/media/pci/mantis/mantis_link.h
  67. 0 0
      drivers/media/pci/mantis/mantis_pci.c
  68. 0 0
      drivers/media/pci/mantis/mantis_pci.h
  69. 0 0
      drivers/media/pci/mantis/mantis_pcmcia.c
  70. 0 0
      drivers/media/pci/mantis/mantis_reg.h
  71. 0 0
      drivers/media/pci/mantis/mantis_uart.c
  72. 0 0
      drivers/media/pci/mantis/mantis_uart.h
  73. 0 0
      drivers/media/pci/mantis/mantis_vp1033.c
  74. 0 0
      drivers/media/pci/mantis/mantis_vp1033.h
  75. 0 0
      drivers/media/pci/mantis/mantis_vp1034.c
  76. 0 0
      drivers/media/pci/mantis/mantis_vp1034.h
  77. 0 0
      drivers/media/pci/mantis/mantis_vp1041.c
  78. 0 0
      drivers/media/pci/mantis/mantis_vp1041.h
  79. 0 0
      drivers/media/pci/mantis/mantis_vp2033.c
  80. 0 0
      drivers/media/pci/mantis/mantis_vp2033.h
  81. 0 0
      drivers/media/pci/mantis/mantis_vp2040.c
  82. 0 0
      drivers/media/pci/mantis/mantis_vp2040.h
  83. 0 0
      drivers/media/pci/mantis/mantis_vp3028.c
  84. 0 0
      drivers/media/pci/mantis/mantis_vp3028.h
  85. 0 0
      drivers/media/pci/mantis/mantis_vp3030.c
  86. 0 0
      drivers/media/pci/mantis/mantis_vp3030.h
  87. 0 0
      drivers/media/pci/ngene/Kconfig
  88. 0 0
      drivers/media/pci/ngene/Makefile
  89. 0 0
      drivers/media/pci/ngene/ngene-cards.c
  90. 0 0
      drivers/media/pci/ngene/ngene-core.c
  91. 0 0
      drivers/media/pci/ngene/ngene-dvb.c
  92. 0 0
      drivers/media/pci/ngene/ngene-i2c.c
  93. 0 0
      drivers/media/pci/ngene/ngene.h
  94. 0 0
      drivers/media/pci/pluto2/Kconfig
  95. 0 0
      drivers/media/pci/pluto2/Makefile
  96. 0 0
      drivers/media/pci/pluto2/pluto2.c
  97. 0 0
      drivers/media/pci/pt1/Kconfig
  98. 0 0
      drivers/media/pci/pt1/Makefile
  99. 0 0
      drivers/media/pci/pt1/pt1.c
  100. 0 0
      drivers/media/pci/pt1/va1j5jf8007s.c

+ 1 - 1
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>

+ 1 - 1
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"

+ 1 - 1
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/

+ 9 - 9
drivers/media/dvb/Kconfig → 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

+ 0 - 0
drivers/media/dvb/Makefile → drivers/media/pci/Makefile


+ 0 - 0
drivers/media/dvb/b2c2/Kconfig → drivers/media/pci/b2c2/Kconfig


+ 0 - 0
drivers/media/dvb/b2c2/Makefile → drivers/media/pci/b2c2/Makefile


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-common.h → drivers/media/pci/b2c2/flexcop-common.h


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-dma.c → drivers/media/pci/b2c2/flexcop-dma.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-eeprom.c → drivers/media/pci/b2c2/flexcop-eeprom.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-fe-tuner.c → drivers/media/pci/b2c2/flexcop-fe-tuner.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-hw-filter.c → drivers/media/pci/b2c2/flexcop-hw-filter.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-i2c.c → drivers/media/pci/b2c2/flexcop-i2c.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-misc.c → drivers/media/pci/b2c2/flexcop-misc.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-pci.c → drivers/media/pci/b2c2/flexcop-pci.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-reg.h → drivers/media/pci/b2c2/flexcop-reg.h


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-sram.c → drivers/media/pci/b2c2/flexcop-sram.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-usb.c → drivers/media/pci/b2c2/flexcop-usb.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop-usb.h → drivers/media/pci/b2c2/flexcop-usb.h


+ 0 - 0
drivers/media/dvb/b2c2/flexcop.c → drivers/media/pci/b2c2/flexcop.c


+ 0 - 0
drivers/media/dvb/b2c2/flexcop.h → drivers/media/pci/b2c2/flexcop.h


+ 0 - 0
drivers/media/dvb/b2c2/flexcop_ibi_value_be.h → drivers/media/pci/b2c2/flexcop_ibi_value_be.h


+ 0 - 0
drivers/media/dvb/b2c2/flexcop_ibi_value_le.h → drivers/media/pci/b2c2/flexcop_ibi_value_le.h


+ 0 - 0
drivers/media/dvb/bt8xx/Kconfig → drivers/media/pci/bt8xx/Kconfig


+ 0 - 0
drivers/media/dvb/bt8xx/Makefile → drivers/media/pci/bt8xx/Makefile


+ 0 - 0
drivers/media/dvb/bt8xx/bt878.c → drivers/media/pci/bt8xx/bt878.c


+ 0 - 0
drivers/media/dvb/bt8xx/bt878.h → drivers/media/pci/bt8xx/bt878.h


+ 0 - 0
drivers/media/dvb/bt8xx/dst.c → drivers/media/pci/bt8xx/dst.c


+ 0 - 0
drivers/media/dvb/bt8xx/dst_ca.c → drivers/media/pci/bt8xx/dst_ca.c


+ 0 - 0
drivers/media/dvb/bt8xx/dst_ca.h → drivers/media/pci/bt8xx/dst_ca.h


+ 0 - 0
drivers/media/dvb/bt8xx/dst_common.h → drivers/media/pci/bt8xx/dst_common.h


+ 0 - 0
drivers/media/dvb/bt8xx/dst_priv.h → drivers/media/pci/bt8xx/dst_priv.h


+ 0 - 0
drivers/media/dvb/bt8xx/dvb-bt8xx.c → drivers/media/pci/bt8xx/dvb-bt8xx.c


+ 0 - 0
drivers/media/dvb/bt8xx/dvb-bt8xx.h → drivers/media/pci/bt8xx/dvb-bt8xx.h


+ 0 - 0
drivers/media/dvb/ddbridge/Kconfig → drivers/media/pci/ddbridge/Kconfig


+ 0 - 0
drivers/media/dvb/ddbridge/Makefile → drivers/media/pci/ddbridge/Makefile


+ 0 - 0
drivers/media/dvb/ddbridge/ddbridge-core.c → drivers/media/pci/ddbridge/ddbridge-core.c


+ 0 - 0
drivers/media/dvb/ddbridge/ddbridge-regs.h → drivers/media/pci/ddbridge/ddbridge-regs.h


+ 0 - 0
drivers/media/dvb/ddbridge/ddbridge.h → drivers/media/pci/ddbridge/ddbridge.h


+ 0 - 0
drivers/media/dvb/dm1105/Kconfig → drivers/media/pci/dm1105/Kconfig


+ 0 - 0
drivers/media/dvb/dm1105/Makefile → drivers/media/pci/dm1105/Makefile


+ 0 - 0
drivers/media/dvb/dm1105/dm1105.c → drivers/media/pci/dm1105/dm1105.c


+ 0 - 0
drivers/media/dvb/mantis/Kconfig → drivers/media/pci/mantis/Kconfig


+ 0 - 0
drivers/media/dvb/mantis/Makefile → drivers/media/pci/mantis/Makefile


+ 0 - 0
drivers/media/dvb/mantis/hopper_cards.c → drivers/media/pci/mantis/hopper_cards.c


+ 0 - 0
drivers/media/dvb/mantis/hopper_vp3028.c → drivers/media/pci/mantis/hopper_vp3028.c


+ 0 - 0
drivers/media/dvb/mantis/hopper_vp3028.h → drivers/media/pci/mantis/hopper_vp3028.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_ca.c → drivers/media/pci/mantis/mantis_ca.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_ca.h → drivers/media/pci/mantis/mantis_ca.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_cards.c → drivers/media/pci/mantis/mantis_cards.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_common.h → drivers/media/pci/mantis/mantis_common.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_core.c → drivers/media/pci/mantis/mantis_core.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_core.h → drivers/media/pci/mantis/mantis_core.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_dma.c → drivers/media/pci/mantis/mantis_dma.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_dma.h → drivers/media/pci/mantis/mantis_dma.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_dvb.c → drivers/media/pci/mantis/mantis_dvb.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_dvb.h → drivers/media/pci/mantis/mantis_dvb.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_evm.c → drivers/media/pci/mantis/mantis_evm.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_hif.c → drivers/media/pci/mantis/mantis_hif.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_hif.h → drivers/media/pci/mantis/mantis_hif.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_i2c.c → drivers/media/pci/mantis/mantis_i2c.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_i2c.h → drivers/media/pci/mantis/mantis_i2c.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_input.c → drivers/media/pci/mantis/mantis_input.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_ioc.c → drivers/media/pci/mantis/mantis_ioc.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_ioc.h → drivers/media/pci/mantis/mantis_ioc.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_link.h → drivers/media/pci/mantis/mantis_link.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_pci.c → drivers/media/pci/mantis/mantis_pci.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_pci.h → drivers/media/pci/mantis/mantis_pci.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_pcmcia.c → drivers/media/pci/mantis/mantis_pcmcia.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_reg.h → drivers/media/pci/mantis/mantis_reg.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_uart.c → drivers/media/pci/mantis/mantis_uart.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_uart.h → drivers/media/pci/mantis/mantis_uart.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp1033.c → drivers/media/pci/mantis/mantis_vp1033.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp1033.h → drivers/media/pci/mantis/mantis_vp1033.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp1034.c → drivers/media/pci/mantis/mantis_vp1034.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp1034.h → drivers/media/pci/mantis/mantis_vp1034.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp1041.c → drivers/media/pci/mantis/mantis_vp1041.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp1041.h → drivers/media/pci/mantis/mantis_vp1041.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp2033.c → drivers/media/pci/mantis/mantis_vp2033.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp2033.h → drivers/media/pci/mantis/mantis_vp2033.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp2040.c → drivers/media/pci/mantis/mantis_vp2040.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp2040.h → drivers/media/pci/mantis/mantis_vp2040.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp3028.c → drivers/media/pci/mantis/mantis_vp3028.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp3028.h → drivers/media/pci/mantis/mantis_vp3028.h


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp3030.c → drivers/media/pci/mantis/mantis_vp3030.c


+ 0 - 0
drivers/media/dvb/mantis/mantis_vp3030.h → drivers/media/pci/mantis/mantis_vp3030.h


+ 0 - 0
drivers/media/dvb/ngene/Kconfig → drivers/media/pci/ngene/Kconfig


+ 0 - 0
drivers/media/dvb/ngene/Makefile → drivers/media/pci/ngene/Makefile


+ 0 - 0
drivers/media/dvb/ngene/ngene-cards.c → drivers/media/pci/ngene/ngene-cards.c


+ 0 - 0
drivers/media/dvb/ngene/ngene-core.c → drivers/media/pci/ngene/ngene-core.c


+ 0 - 0
drivers/media/dvb/ngene/ngene-dvb.c → drivers/media/pci/ngene/ngene-dvb.c


+ 0 - 0
drivers/media/dvb/ngene/ngene-i2c.c → drivers/media/pci/ngene/ngene-i2c.c


+ 0 - 0
drivers/media/dvb/ngene/ngene.h → drivers/media/pci/ngene/ngene.h


+ 0 - 0
drivers/media/dvb/pluto2/Kconfig → drivers/media/pci/pluto2/Kconfig


+ 0 - 0
drivers/media/dvb/pluto2/Makefile → drivers/media/pci/pluto2/Makefile


+ 0 - 0
drivers/media/dvb/pluto2/pluto2.c → drivers/media/pci/pluto2/pluto2.c


+ 0 - 0
drivers/media/dvb/pt1/Kconfig → drivers/media/pci/pt1/Kconfig


+ 0 - 0
drivers/media/dvb/pt1/Makefile → drivers/media/pci/pt1/Makefile


+ 0 - 0
drivers/media/dvb/pt1/pt1.c → drivers/media/pci/pt1/pt1.c


+ 0 - 0
drivers/media/dvb/pt1/va1j5jf8007s.c → drivers/media/pci/pt1/va1j5jf8007s.c


Some files were not shown because too many files changed in this diff