@@ -166,4 +166,8 @@ source "drivers/media/radio/Kconfig"
source "drivers/media/dvb-core/Kconfig"
source "drivers/media/dvb/Kconfig"
+comment "Supported DVB Frontends"
+ depends on DVB_CORE
+source "drivers/media/dvb-frontends/Kconfig"
+
endif # MEDIA_SUPPORT
@@ -11,4 +11,4 @@ endif
obj-y += v4l2-core/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
-obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/
+obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/
@@ -34,4 +34,4 @@ obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o
obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o
ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
similarity index 100%
rename from drivers/media/dvb/frontends/Kconfig
rename to drivers/media/dvb-frontends/Kconfig
similarity index 100%
rename from drivers/media/dvb/frontends/Makefile
rename to drivers/media/dvb-frontends/Makefile
similarity index 100%
rename from drivers/media/dvb/frontends/a8293.c
rename to drivers/media/dvb-frontends/a8293.c
similarity index 100%
rename from drivers/media/dvb/frontends/a8293.h
rename to drivers/media/dvb-frontends/a8293.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9013.c
rename to drivers/media/dvb-frontends/af9013.c
similarity index 100%
rename from drivers/media/dvb/frontends/af9013.h
rename to drivers/media/dvb-frontends/af9013.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9013_priv.h
rename to drivers/media/dvb-frontends/af9013_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9033.c
rename to drivers/media/dvb-frontends/af9033.c
similarity index 100%
rename from drivers/media/dvb/frontends/af9033.h
rename to drivers/media/dvb-frontends/af9033.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9033_priv.h
rename to drivers/media/dvb-frontends/af9033_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/atbm8830.c
rename to drivers/media/dvb-frontends/atbm8830.c
similarity index 100%
rename from drivers/media/dvb/frontends/atbm8830.h
rename to drivers/media/dvb-frontends/atbm8830.h
similarity index 100%
rename from drivers/media/dvb/frontends/atbm8830_priv.h
rename to drivers/media/dvb-frontends/atbm8830_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/au8522.h
rename to drivers/media/dvb-frontends/au8522.h
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_common.c
rename to drivers/media/dvb-frontends/au8522_common.c
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_decoder.c
rename to drivers/media/dvb-frontends/au8522_decoder.c
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_dig.c
rename to drivers/media/dvb-frontends/au8522_dig.c
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_priv.h
rename to drivers/media/dvb-frontends/au8522_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/bcm3510.c
rename to drivers/media/dvb-frontends/bcm3510.c
similarity index 100%
rename from drivers/media/dvb/frontends/bcm3510.h
rename to drivers/media/dvb-frontends/bcm3510.h
similarity index 100%
rename from drivers/media/dvb/frontends/bcm3510_priv.h
rename to drivers/media/dvb-frontends/bcm3510_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/bsbe1-d01a.h
rename to drivers/media/dvb-frontends/bsbe1-d01a.h
similarity index 100%
rename from drivers/media/dvb/frontends/bsbe1.h
rename to drivers/media/dvb-frontends/bsbe1.h
similarity index 100%
rename from drivers/media/dvb/frontends/bsru6.h
rename to drivers/media/dvb-frontends/bsru6.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx22700.c
rename to drivers/media/dvb-frontends/cx22700.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx22700.h
rename to drivers/media/dvb-frontends/cx22700.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx22702.c
rename to drivers/media/dvb-frontends/cx22702.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx22702.h
rename to drivers/media/dvb-frontends/cx22702.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24110.c
rename to drivers/media/dvb-frontends/cx24110.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24110.h
rename to drivers/media/dvb-frontends/cx24110.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24113.c
rename to drivers/media/dvb-frontends/cx24113.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24113.h
rename to drivers/media/dvb-frontends/cx24113.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24116.c
rename to drivers/media/dvb-frontends/cx24116.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24116.h
rename to drivers/media/dvb-frontends/cx24116.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24123.c
rename to drivers/media/dvb-frontends/cx24123.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24123.h
rename to drivers/media/dvb-frontends/cx24123.h
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r.h
rename to drivers/media/dvb-frontends/cxd2820r.h
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_c.c
rename to drivers/media/dvb-frontends/cxd2820r_c.c
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_core.c
rename to drivers/media/dvb-frontends/cxd2820r_core.c
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_priv.h
rename to drivers/media/dvb-frontends/cxd2820r_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_t.c
rename to drivers/media/dvb-frontends/cxd2820r_t.c
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_t2.c
rename to drivers/media/dvb-frontends/cxd2820r_t2.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib0070.c
rename to drivers/media/dvb-frontends/dib0070.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib0070.h
rename to drivers/media/dvb-frontends/dib0070.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib0090.c
rename to drivers/media/dvb-frontends/dib0090.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib0090.h
rename to drivers/media/dvb-frontends/dib0090.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000.h
rename to drivers/media/dvb-frontends/dib3000.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mb.c
rename to drivers/media/dvb-frontends/dib3000mb.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mb_priv.h
rename to drivers/media/dvb-frontends/dib3000mb_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mc.c
rename to drivers/media/dvb-frontends/dib3000mc.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mc.h
rename to drivers/media/dvb-frontends/dib3000mc.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000m.c
rename to drivers/media/dvb-frontends/dib7000m.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000m.h
rename to drivers/media/dvb-frontends/dib7000m.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000p.c
rename to drivers/media/dvb-frontends/dib7000p.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000p.h
rename to drivers/media/dvb-frontends/dib7000p.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib8000.c
rename to drivers/media/dvb-frontends/dib8000.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib8000.h
rename to drivers/media/dvb-frontends/dib8000.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib9000.c
rename to drivers/media/dvb-frontends/dib9000.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib9000.h
rename to drivers/media/dvb-frontends/dib9000.h
similarity index 100%
rename from drivers/media/dvb/frontends/dibx000_common.c
rename to drivers/media/dvb-frontends/dibx000_common.c
similarity index 100%
rename from drivers/media/dvb/frontends/dibx000_common.h
rename to drivers/media/dvb-frontends/dibx000_common.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxd.h
rename to drivers/media/dvb-frontends/drxd.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_firm.c
rename to drivers/media/dvb-frontends/drxd_firm.c
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_firm.h
rename to drivers/media/dvb-frontends/drxd_firm.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_hard.c
rename to drivers/media/dvb-frontends/drxd_hard.c
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_map_firm.h
rename to drivers/media/dvb-frontends/drxd_map_firm.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxk.h
rename to drivers/media/dvb-frontends/drxk.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxk_hard.c
rename to drivers/media/dvb-frontends/drxk_hard.c
similarity index 100%
rename from drivers/media/dvb/frontends/drxk_hard.h
rename to drivers/media/dvb-frontends/drxk_hard.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxk_map.h
rename to drivers/media/dvb-frontends/drxk_map.h
similarity index 100%
rename from drivers/media/dvb/frontends/ds3000.c
rename to drivers/media/dvb-frontends/ds3000.c
similarity index 100%
rename from drivers/media/dvb/frontends/ds3000.h
rename to drivers/media/dvb-frontends/ds3000.h
similarity index 100%
rename from drivers/media/dvb/frontends/dvb-pll.c
rename to drivers/media/dvb-frontends/dvb-pll.c
similarity index 100%
rename from drivers/media/dvb/frontends/dvb-pll.h
rename to drivers/media/dvb-frontends/dvb-pll.h
similarity index 100%
rename from drivers/media/dvb/frontends/dvb_dummy_fe.c
rename to drivers/media/dvb-frontends/dvb_dummy_fe.c
similarity index 100%
rename from drivers/media/dvb/frontends/dvb_dummy_fe.h
rename to drivers/media/dvb-frontends/dvb_dummy_fe.h
similarity index 100%
rename from drivers/media/dvb/frontends/ec100.c
rename to drivers/media/dvb-frontends/ec100.c
similarity index 100%
rename from drivers/media/dvb/frontends/ec100.h
rename to drivers/media/dvb-frontends/ec100.h
similarity index 100%
rename from drivers/media/dvb/frontends/ec100_priv.h
rename to drivers/media/dvb-frontends/ec100_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/eds1547.h
rename to drivers/media/dvb-frontends/eds1547.h
similarity index 100%
rename from drivers/media/dvb/frontends/hd29l2.c
rename to drivers/media/dvb-frontends/hd29l2.c
similarity index 100%
rename from drivers/media/dvb/frontends/hd29l2.h
rename to drivers/media/dvb-frontends/hd29l2.h
similarity index 100%
rename from drivers/media/dvb/frontends/hd29l2_priv.h
rename to drivers/media/dvb-frontends/hd29l2_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/isl6405.c
rename to drivers/media/dvb-frontends/isl6405.c
similarity index 100%
rename from drivers/media/dvb/frontends/isl6405.h
rename to drivers/media/dvb-frontends/isl6405.h
similarity index 100%
rename from drivers/media/dvb/frontends/isl6421.c
rename to drivers/media/dvb-frontends/isl6421.c
similarity index 100%
rename from drivers/media/dvb/frontends/isl6421.h
rename to drivers/media/dvb-frontends/isl6421.h
similarity index 100%
rename from drivers/media/dvb/frontends/isl6423.c
rename to drivers/media/dvb-frontends/isl6423.c
similarity index 100%
rename from drivers/media/dvb/frontends/isl6423.h
rename to drivers/media/dvb-frontends/isl6423.h
similarity index 100%
rename from drivers/media/dvb/frontends/it913x-fe-priv.h
rename to drivers/media/dvb-frontends/it913x-fe-priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/it913x-fe.c
rename to drivers/media/dvb-frontends/it913x-fe.c
similarity index 100%
rename from drivers/media/dvb/frontends/it913x-fe.h
rename to drivers/media/dvb-frontends/it913x-fe.h
similarity index 100%
rename from drivers/media/dvb/frontends/itd1000.c
rename to drivers/media/dvb-frontends/itd1000.c
similarity index 100%
rename from drivers/media/dvb/frontends/itd1000.h
rename to drivers/media/dvb-frontends/itd1000.h
similarity index 100%
rename from drivers/media/dvb/frontends/itd1000_priv.h
rename to drivers/media/dvb-frontends/itd1000_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/ix2505v.c
rename to drivers/media/dvb-frontends/ix2505v.c
similarity index 100%
rename from drivers/media/dvb/frontends/ix2505v.h
rename to drivers/media/dvb-frontends/ix2505v.h
similarity index 100%
rename from drivers/media/dvb/frontends/l64781.c
rename to drivers/media/dvb-frontends/l64781.c
similarity index 100%
rename from drivers/media/dvb/frontends/l64781.h
rename to drivers/media/dvb-frontends/l64781.h
similarity index 100%
rename from drivers/media/dvb/frontends/lg2160.c
rename to drivers/media/dvb-frontends/lg2160.c
similarity index 100%
rename from drivers/media/dvb/frontends/lg2160.h
rename to drivers/media/dvb-frontends/lg2160.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt3305.c
rename to drivers/media/dvb-frontends/lgdt3305.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt3305.h
rename to drivers/media/dvb-frontends/lgdt3305.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt330x.c
rename to drivers/media/dvb-frontends/lgdt330x.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt330x.h
rename to drivers/media/dvb-frontends/lgdt330x.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt330x_priv.h
rename to drivers/media/dvb-frontends/lgdt330x_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gl5.c
rename to drivers/media/dvb-frontends/lgs8gl5.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gl5.h
rename to drivers/media/dvb-frontends/lgs8gl5.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gxx.c
rename to drivers/media/dvb-frontends/lgs8gxx.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gxx.h
rename to drivers/media/dvb-frontends/lgs8gxx.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gxx_priv.h
rename to drivers/media/dvb-frontends/lgs8gxx_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/lnbh24.h
rename to drivers/media/dvb-frontends/lnbh24.h
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp21.c
rename to drivers/media/dvb-frontends/lnbp21.c
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp21.h
rename to drivers/media/dvb-frontends/lnbp21.h
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp22.c
rename to drivers/media/dvb-frontends/lnbp22.c
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp22.h
rename to drivers/media/dvb-frontends/lnbp22.h
similarity index 100%
rename from drivers/media/dvb/frontends/m88rs2000.c
rename to drivers/media/dvb-frontends/m88rs2000.c
similarity index 100%
rename from drivers/media/dvb/frontends/m88rs2000.h
rename to drivers/media/dvb-frontends/m88rs2000.h
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a16.c
rename to drivers/media/dvb-frontends/mb86a16.c
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a16.h
rename to drivers/media/dvb-frontends/mb86a16.h
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a16_priv.h
rename to drivers/media/dvb-frontends/mb86a16_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a20s.c
rename to drivers/media/dvb-frontends/mb86a20s.c
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a20s.h
rename to drivers/media/dvb-frontends/mb86a20s.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt312.c
rename to drivers/media/dvb-frontends/mt312.c
similarity index 100%
rename from drivers/media/dvb/frontends/mt312.h
rename to drivers/media/dvb-frontends/mt312.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt312_priv.h
rename to drivers/media/dvb-frontends/mt312_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt352.c
rename to drivers/media/dvb-frontends/mt352.c
similarity index 100%
rename from drivers/media/dvb/frontends/mt352.h
rename to drivers/media/dvb-frontends/mt352.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt352_priv.h
rename to drivers/media/dvb-frontends/mt352_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/nxt200x.c
rename to drivers/media/dvb-frontends/nxt200x.c
similarity index 100%
rename from drivers/media/dvb/frontends/nxt200x.h
rename to drivers/media/dvb-frontends/nxt200x.h
similarity index 100%
rename from drivers/media/dvb/frontends/nxt6000.c
rename to drivers/media/dvb-frontends/nxt6000.c
similarity index 100%
rename from drivers/media/dvb/frontends/nxt6000.h
rename to drivers/media/dvb-frontends/nxt6000.h
similarity index 100%
rename from drivers/media/dvb/frontends/nxt6000_priv.h
rename to drivers/media/dvb-frontends/nxt6000_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/or51132.c
rename to drivers/media/dvb-frontends/or51132.c
similarity index 100%
rename from drivers/media/dvb/frontends/or51132.h
rename to drivers/media/dvb-frontends/or51132.h
similarity index 100%
rename from drivers/media/dvb/frontends/or51211.c
rename to drivers/media/dvb-frontends/or51211.c
similarity index 100%
rename from drivers/media/dvb/frontends/or51211.h
rename to drivers/media/dvb-frontends/or51211.h
similarity index 100%
rename from drivers/media/dvb/frontends/rtl2830.c
rename to drivers/media/dvb-frontends/rtl2830.c
similarity index 100%
rename from drivers/media/dvb/frontends/rtl2830.h
rename to drivers/media/dvb-frontends/rtl2830.h
similarity index 100%
rename from drivers/media/dvb/frontends/rtl2830_priv.h
rename to drivers/media/dvb-frontends/rtl2830_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1409.c
rename to drivers/media/dvb-frontends/s5h1409.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1409.h
rename to drivers/media/dvb-frontends/s5h1409.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1411.c
rename to drivers/media/dvb-frontends/s5h1411.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1411.h
rename to drivers/media/dvb-frontends/s5h1411.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1420.c
rename to drivers/media/dvb-frontends/s5h1420.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1420.h
rename to drivers/media/dvb-frontends/s5h1420.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1420_priv.h
rename to drivers/media/dvb-frontends/s5h1420_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1432.c
rename to drivers/media/dvb-frontends/s5h1432.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1432.h
rename to drivers/media/dvb-frontends/s5h1432.h
similarity index 100%
rename from drivers/media/dvb/frontends/s921.c
rename to drivers/media/dvb-frontends/s921.c
similarity index 100%
rename from drivers/media/dvb/frontends/s921.h
rename to drivers/media/dvb-frontends/s921.h
similarity index 100%
rename from drivers/media/dvb/frontends/si21xx.c
rename to drivers/media/dvb-frontends/si21xx.c
similarity index 100%
rename from drivers/media/dvb/frontends/si21xx.h
rename to drivers/media/dvb-frontends/si21xx.h
similarity index 100%
rename from drivers/media/dvb/frontends/sp8870.c
rename to drivers/media/dvb-frontends/sp8870.c
similarity index 100%
rename from drivers/media/dvb/frontends/sp8870.h
rename to drivers/media/dvb-frontends/sp8870.h
similarity index 100%
rename from drivers/media/dvb/frontends/sp887x.c
rename to drivers/media/dvb-frontends/sp887x.c
similarity index 100%
rename from drivers/media/dvb/frontends/sp887x.h
rename to drivers/media/dvb-frontends/sp887x.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_algo.c
rename to drivers/media/dvb-frontends/stb0899_algo.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_cfg.h
rename to drivers/media/dvb-frontends/stb0899_cfg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_drv.c
rename to drivers/media/dvb-frontends/stb0899_drv.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_drv.h
rename to drivers/media/dvb-frontends/stb0899_drv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_priv.h
rename to drivers/media/dvb-frontends/stb0899_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_reg.h
rename to drivers/media/dvb-frontends/stb0899_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6000.c
rename to drivers/media/dvb-frontends/stb6000.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb6000.h
rename to drivers/media/dvb-frontends/stb6000.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100.c
rename to drivers/media/dvb-frontends/stb6100.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100.h
rename to drivers/media/dvb-frontends/stb6100.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100_cfg.h
rename to drivers/media/dvb-frontends/stb6100_cfg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100_proc.h
rename to drivers/media/dvb-frontends/stb6100_proc.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0288.c
rename to drivers/media/dvb-frontends/stv0288.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0288.h
rename to drivers/media/dvb-frontends/stv0288.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0297.c
rename to drivers/media/dvb-frontends/stv0297.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0297.h
rename to drivers/media/dvb-frontends/stv0297.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0299.c
rename to drivers/media/dvb-frontends/stv0299.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0299.h
rename to drivers/media/dvb-frontends/stv0299.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367.c
rename to drivers/media/dvb-frontends/stv0367.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367.h
rename to drivers/media/dvb-frontends/stv0367.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367_priv.h
rename to drivers/media/dvb-frontends/stv0367_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367_regs.h
rename to drivers/media/dvb-frontends/stv0367_regs.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900.h
rename to drivers/media/dvb-frontends/stv0900.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_core.c
rename to drivers/media/dvb-frontends/stv0900_core.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_init.h
rename to drivers/media/dvb-frontends/stv0900_init.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_priv.h
rename to drivers/media/dvb-frontends/stv0900_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_reg.h
rename to drivers/media/dvb-frontends/stv0900_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_sw.c
rename to drivers/media/dvb-frontends/stv0900_sw.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x.c
rename to drivers/media/dvb-frontends/stv090x.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x.h
rename to drivers/media/dvb-frontends/stv090x.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x_priv.h
rename to drivers/media/dvb-frontends/stv090x_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x_reg.h
rename to drivers/media/dvb-frontends/stv090x_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110.c
rename to drivers/media/dvb-frontends/stv6110.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110.h
rename to drivers/media/dvb-frontends/stv6110.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x.c
rename to drivers/media/dvb-frontends/stv6110x.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x.h
rename to drivers/media/dvb-frontends/stv6110x.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x_priv.h
rename to drivers/media/dvb-frontends/stv6110x_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x_reg.h
rename to drivers/media/dvb-frontends/stv6110x_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10021.c
rename to drivers/media/dvb-frontends/tda10021.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10023.c
rename to drivers/media/dvb-frontends/tda10023.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda1002x.h
rename to drivers/media/dvb-frontends/tda1002x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10048.c
rename to drivers/media/dvb-frontends/tda10048.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10048.h
rename to drivers/media/dvb-frontends/tda10048.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda1004x.c
rename to drivers/media/dvb-frontends/tda1004x.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda1004x.h
rename to drivers/media/dvb-frontends/tda1004x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10071.c
rename to drivers/media/dvb-frontends/tda10071.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10071.h
rename to drivers/media/dvb-frontends/tda10071.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10071_priv.h
rename to drivers/media/dvb-frontends/tda10071_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10086.c
rename to drivers/media/dvb-frontends/tda10086.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10086.h
rename to drivers/media/dvb-frontends/tda10086.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda18271c2dd.c
rename to drivers/media/dvb-frontends/tda18271c2dd.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda18271c2dd.h
rename to drivers/media/dvb-frontends/tda18271c2dd.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda18271c2dd_maps.h
rename to drivers/media/dvb-frontends/tda18271c2dd_maps.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda665x.c
rename to drivers/media/dvb-frontends/tda665x.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda665x.h
rename to drivers/media/dvb-frontends/tda665x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda8083.c
rename to drivers/media/dvb-frontends/tda8083.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda8083.h
rename to drivers/media/dvb-frontends/tda8083.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda8261.c
rename to drivers/media/dvb-frontends/tda8261.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda8261.h
rename to drivers/media/dvb-frontends/tda8261.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda8261_cfg.h
rename to drivers/media/dvb-frontends/tda8261_cfg.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda826x.c
rename to drivers/media/dvb-frontends/tda826x.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda826x.h
rename to drivers/media/dvb-frontends/tda826x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tdhd1.h
rename to drivers/media/dvb-frontends/tdhd1.h
similarity index 100%
rename from drivers/media/dvb/frontends/tua6100.c
rename to drivers/media/dvb-frontends/tua6100.c
similarity index 100%
rename from drivers/media/dvb/frontends/tua6100.h
rename to drivers/media/dvb-frontends/tua6100.h
similarity index 100%
rename from drivers/media/dvb/frontends/ves1820.c
rename to drivers/media/dvb-frontends/ves1820.c
similarity index 100%
rename from drivers/media/dvb/frontends/ves1820.h
rename to drivers/media/dvb-frontends/ves1820.h
similarity index 100%
rename from drivers/media/dvb/frontends/ves1x93.c
rename to drivers/media/dvb-frontends/ves1x93.c
similarity index 100%
rename from drivers/media/dvb/frontends/ves1x93.h
rename to drivers/media/dvb-frontends/ves1x93.h
similarity index 100%
rename from drivers/media/dvb/frontends/z0194a.h
rename to drivers/media/dvb-frontends/z0194a.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10036.c
rename to drivers/media/dvb-frontends/zl10036.c
similarity index 100%
rename from drivers/media/dvb/frontends/zl10036.h
rename to drivers/media/dvb-frontends/zl10036.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10039.c
rename to drivers/media/dvb-frontends/zl10039.c
similarity index 100%
rename from drivers/media/dvb/frontends/zl10039.h
rename to drivers/media/dvb-frontends/zl10039.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10353.c
rename to drivers/media/dvb-frontends/zl10353.c
similarity index 100%
rename from drivers/media/dvb/frontends/zl10353.h
rename to drivers/media/dvb-frontends/zl10353.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10353_priv.h
rename to drivers/media/dvb-frontends/zl10353_priv.h
@@ -58,8 +58,4 @@ comment "Supported ddbridge ('Octopus') Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/ddbridge/Kconfig"
-comment "Supported DVB Frontends"
- depends on DVB_CORE
-source "drivers/media/dvb/frontends/Kconfig"
-
endif # DVB_CAPTURE_DRIVERS
@@ -2,8 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-y := frontends/ \
- ttpci/ \
+obj-y := ttpci/ \
ttusb-dec/ \
ttusb-budget/ \
b2c2/ \
@@ -12,5 +12,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
b2c2-flexcop-usb-objs = flexcop-usb.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
-ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
@@ -1,6 +1,6 @@
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/video/bt8xx
ccflags-y += -Idrivers/media/common/tuners
@@ -7,7 +7,7 @@ ddbridge-objs := ddbridge-core.o
obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
ccflags-y += -Idrivers/media/dvb-core/
-ccflags-y += -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
# For the staging CI driver cxd2099
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_DM1105) += dm1105.o
-ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends
@@ -114,7 +114,7 @@ dvb-usb-af9035-objs = af9035.o
obj-$(CONFIG_DVB_USB_AF9035) += dvb-usb-af9035.o
ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
+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
@@ -25,4 +25,4 @@ obj-$(CONFIG_MANTIS_CORE) += mantis_core.o
obj-$(CONFIG_DVB_MANTIS) += mantis.o
obj-$(CONFIG_DVB_HOPPER) += hopper.o
-ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
@@ -7,7 +7,7 @@ ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o
obj-$(CONFIG_DVB_NGENE) += ngene.o
ccflags-y += -Idrivers/media/dvb-core/
-ccflags-y += -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
# For the staging CI driver cxd2099
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
-ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
@@ -2,4 +2,4 @@ earth-pt1-objs := pt1.o va1j5jf8007s.o va1j5jf8007t.o
obj-$(CONFIG_DVB_PT1) += earth-pt1.o
-ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb-frontends
@@ -17,5 +17,5 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-ci.o
obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
-ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
-ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends
@@ -30,6 +30,6 @@ obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners
@@ -186,5 +186,5 @@ obj-y += davinci/
obj-$(CONFIG_ARCH_OMAP) += omap/
ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners
@@ -4,6 +4,6 @@ obj-$(CONFIG_VIDEO_AU0828) += au0828.o
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
@@ -9,5 +9,5 @@ obj-$(CONFIG_VIDEO_CX18) += cx18.o
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/common/tuners
@@ -11,6 +11,6 @@ obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/dvb/dvb-usb
@@ -10,6 +10,6 @@ obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
@@ -10,4 +10,4 @@ obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
@@ -13,4 +13,4 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
@@ -12,4 +12,4 @@ obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
@@ -10,5 +10,5 @@ obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o
ccflags-y += -I$(srctree)/drivers/media/video
ccflags-y += -I$(srctree)/drivers/media/common/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
@@ -19,4 +19,4 @@ obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
@@ -13,4 +13,4 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
ccflags-y += -I$(srctree)/drivers/media/video
ccflags-y += -I$(srctree)/drivers/media/common/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
@@ -7,6 +7,6 @@ obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o
ccflags-y += -I$(srctree)/drivers/media/video
ccflags-y += -I$(srctree)/drivers/media/common/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
@@ -5,5 +5,5 @@ obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
@@ -12,4 +12,4 @@ obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
@@ -1,5 +1,5 @@
obj-$(CONFIG_DVB_CXD2099) += cxd2099.o
ccflags-y += -Idrivers/media/dvb-core/
-ccflags-y += -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
@@ -26,5 +26,5 @@ s2250-y := s2250-board.o
# S2250 needs cypress ezusb loader from dvb-usb
ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/dvb-core