* [PATCH RFC 00/10] media file tree reorg - part 1
@ 2012-06-14 20:35 Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 01/10] [media] v4l: move v4l2 core into a separate directory Mauro Carvalho Chehab
` (10 more replies)
0 siblings, 11 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
As discussed a while ago, breaking media drivers by V4L or DVB
is confusing, as:
- hybrid devices are at V4L drivers;
- DVB-only devices for chips that support analog are at
V4L drivers;
- Analog support addition on a DVB driver would require it
to move to V4L drivers.
Instead, move all drivers into a per-bus directory, and common drivers
used by more than one driver into /common.
This is the part 1 of this idea: it moves the core drivers to
/drivers/media/foo-core, and re-arranges the DVB files.
After this patch series, the directory structure will be:
drivers/media/
|-- common
| `-- <common drivers>
|-- dvb-core
|-- dvb-frontends
|-- firewire
|-- mmc
| `-- <mmc/sdio drivers>
|-- pci
| `-- <pci/pcie drivers>
|-- radio
| `-- <radio drivers>
|-- rc
| `-- keymaps
|-- tuners
|-- usb
| `-- <usb drivers>
|-- v4l2-core
`-- video
PS.: The "video" directory is currently unchanged. It currently
contains subdevs, common V4L drivers, and V4L bridges.
On this series, I avoided mixing the file tree reorganization with
menu improvements. Those will happen together with the second part,
when the devices under video will be moved to /common, /usb, /pci...
dirs.
Mauro Carvalho Chehab (10):
[media] v4l: move v4l2 core into a separate directory
[media] dvb: move the dvb core one level up
[media] move the dvb/frontends to drivers/media/dvb-frontends
[media] firewire: move it one level up
[media] dvb-usb: move it to drivers/media/usb/dvb-usb
[media] Rename media/dvb as media/pci
[media] b2c2: break it into common/pci/usb directories
[media] common: move media/common/tuners to media/tuners
[media] saa7146: Move it to its own directory
[media] break siano into mmc and usb directories
Documentation/DocBook/media/dvb/kdapi.xml | 2 +-
Documentation/dvb/README.dvb-usb | 2 +-
MAINTAINERS | 4 +-
drivers/media/Kconfig | 20 ++++-
drivers/media/Makefile | 5 +-
drivers/media/common/Kconfig | 12 +--
drivers/media/common/Makefile | 7 +-
drivers/media/{dvb => common}/b2c2/Kconfig | 20 +----
drivers/media/common/b2c2/Makefile | 7 ++
.../media/{dvb => common}/b2c2/flexcop-common.h | 0
.../media/{dvb => common}/b2c2/flexcop-eeprom.c | 0
.../media/{dvb => common}/b2c2/flexcop-fe-tuner.c | 0
.../media/{dvb => common}/b2c2/flexcop-hw-filter.c | 0
drivers/media/{dvb => common}/b2c2/flexcop-i2c.c | 0
drivers/media/{dvb => common}/b2c2/flexcop-misc.c | 0
drivers/media/{dvb => common}/b2c2/flexcop-reg.h | 0
drivers/media/{dvb => common}/b2c2/flexcop-sram.c | 0
drivers/media/{dvb => common}/b2c2/flexcop.c | 0
drivers/media/{dvb => common}/b2c2/flexcop.h | 0
.../{dvb => common}/b2c2/flexcop_ibi_value_be.h | 0
.../{dvb => common}/b2c2/flexcop_ibi_value_le.h | 0
drivers/media/common/saa7146/Kconfig | 9 ++
drivers/media/common/saa7146/Makefile | 5 ++
drivers/media/common/{ => saa7146}/saa7146_core.c | 0
drivers/media/common/{ => saa7146}/saa7146_fops.c | 0
drivers/media/common/{ => saa7146}/saa7146_hlp.c | 0
drivers/media/common/{ => saa7146}/saa7146_i2c.c | 0
drivers/media/common/{ => saa7146}/saa7146_vbi.c | 0
drivers/media/common/{ => saa7146}/saa7146_video.c | 0
drivers/media/common/siano/Kconfig | 17 ++++
drivers/media/{dvb => common}/siano/Makefile | 6 +-
drivers/media/{dvb => common}/siano/sms-cards.c | 0
drivers/media/{dvb => common}/siano/sms-cards.h | 0
drivers/media/{dvb => common}/siano/smscoreapi.c | 0
drivers/media/{dvb => common}/siano/smscoreapi.h | 0
drivers/media/{dvb => common}/siano/smsdvb.c | 0
drivers/media/{dvb => common}/siano/smsendian.c | 0
drivers/media/{dvb => common}/siano/smsendian.h | 0
drivers/media/{dvb => common}/siano/smsir.c | 0
drivers/media/{dvb => common}/siano/smsir.h | 0
drivers/media/dvb-core/Kconfig | 29 +++++++
drivers/media/{dvb => }/dvb-core/Makefile | 0
drivers/media/{dvb => }/dvb-core/demux.h | 0
drivers/media/{dvb => }/dvb-core/dmxdev.c | 0
drivers/media/{dvb => }/dvb-core/dmxdev.h | 0
drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c | 0
drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h | 0
drivers/media/{dvb => }/dvb-core/dvb_demux.c | 0
drivers/media/{dvb => }/dvb-core/dvb_demux.h | 0
drivers/media/{dvb => }/dvb-core/dvb_filter.c | 0
drivers/media/{dvb => }/dvb-core/dvb_filter.h | 0
drivers/media/{dvb => }/dvb-core/dvb_frontend.c | 0
drivers/media/{dvb => }/dvb-core/dvb_frontend.h | 0
drivers/media/{dvb => }/dvb-core/dvb_math.c | 0
drivers/media/{dvb => }/dvb-core/dvb_math.h | 0
drivers/media/{dvb => }/dvb-core/dvb_net.c | 0
drivers/media/{dvb => }/dvb-core/dvb_net.h | 0
drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c | 0
drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h | 0
drivers/media/{dvb => }/dvb-core/dvbdev.c | 0
drivers/media/{dvb => }/dvb-core/dvbdev.h | 0
.../media/{dvb/frontends => dvb-frontends}/Kconfig | 0
.../{dvb/frontends => dvb-frontends}/Makefile | 4 +-
.../media/{dvb/frontends => dvb-frontends}/a8293.c | 0
.../media/{dvb/frontends => dvb-frontends}/a8293.h | 0
.../{dvb/frontends => dvb-frontends}/af9013.c | 0
.../{dvb/frontends => dvb-frontends}/af9013.h | 0
.../{dvb/frontends => dvb-frontends}/af9013_priv.h | 0
.../{dvb/frontends => dvb-frontends}/af9033.c | 0
.../{dvb/frontends => dvb-frontends}/af9033.h | 0
.../{dvb/frontends => dvb-frontends}/af9033_priv.h | 0
.../{dvb/frontends => dvb-frontends}/atbm8830.c | 0
.../{dvb/frontends => dvb-frontends}/atbm8830.h | 0
.../frontends => dvb-frontends}/atbm8830_priv.h | 0
.../{dvb/frontends => dvb-frontends}/au8522.h | 0
.../frontends => dvb-frontends}/au8522_common.c | 0
.../frontends => dvb-frontends}/au8522_decoder.c | 0
.../{dvb/frontends => dvb-frontends}/au8522_dig.c | 0
.../{dvb/frontends => dvb-frontends}/au8522_priv.h | 0
.../{dvb/frontends => dvb-frontends}/bcm3510.c | 0
.../{dvb/frontends => dvb-frontends}/bcm3510.h | 0
.../frontends => dvb-frontends}/bcm3510_priv.h | 0
.../{dvb/frontends => dvb-frontends}/bsbe1-d01a.h | 0
.../media/{dvb/frontends => dvb-frontends}/bsbe1.h | 0
.../media/{dvb/frontends => dvb-frontends}/bsru6.h | 0
.../{dvb/frontends => dvb-frontends}/cx22700.c | 0
.../{dvb/frontends => dvb-frontends}/cx22700.h | 0
.../{dvb/frontends => dvb-frontends}/cx22702.c | 0
.../{dvb/frontends => dvb-frontends}/cx22702.h | 0
.../{dvb/frontends => dvb-frontends}/cx24110.c | 0
.../{dvb/frontends => dvb-frontends}/cx24110.h | 0
.../{dvb/frontends => dvb-frontends}/cx24113.c | 0
.../{dvb/frontends => dvb-frontends}/cx24113.h | 0
.../{dvb/frontends => dvb-frontends}/cx24116.c | 0
.../{dvb/frontends => dvb-frontends}/cx24116.h | 0
.../{dvb/frontends => dvb-frontends}/cx24123.c | 0
.../{dvb/frontends => dvb-frontends}/cx24123.h | 0
.../{dvb/frontends => dvb-frontends}/cxd2820r.h | 0
.../{dvb/frontends => dvb-frontends}/cxd2820r_c.c | 0
.../frontends => dvb-frontends}/cxd2820r_core.c | 0
.../frontends => dvb-frontends}/cxd2820r_priv.h | 0
.../{dvb/frontends => dvb-frontends}/cxd2820r_t.c | 0
.../{dvb/frontends => dvb-frontends}/cxd2820r_t2.c | 0
.../{dvb/frontends => dvb-frontends}/dib0070.c | 0
.../{dvb/frontends => dvb-frontends}/dib0070.h | 0
.../{dvb/frontends => dvb-frontends}/dib0090.c | 0
.../{dvb/frontends => dvb-frontends}/dib0090.h | 0
.../{dvb/frontends => dvb-frontends}/dib3000.h | 0
.../{dvb/frontends => dvb-frontends}/dib3000mb.c | 0
.../frontends => dvb-frontends}/dib3000mb_priv.h | 0
.../{dvb/frontends => dvb-frontends}/dib3000mc.c | 0
.../{dvb/frontends => dvb-frontends}/dib3000mc.h | 0
.../{dvb/frontends => dvb-frontends}/dib7000m.c | 0
.../{dvb/frontends => dvb-frontends}/dib7000m.h | 0
.../{dvb/frontends => dvb-frontends}/dib7000p.c | 0
.../{dvb/frontends => dvb-frontends}/dib7000p.h | 0
.../{dvb/frontends => dvb-frontends}/dib8000.c | 0
.../{dvb/frontends => dvb-frontends}/dib8000.h | 0
.../{dvb/frontends => dvb-frontends}/dib9000.c | 0
.../{dvb/frontends => dvb-frontends}/dib9000.h | 0
.../frontends => dvb-frontends}/dibx000_common.c | 0
.../frontends => dvb-frontends}/dibx000_common.h | 0
.../media/{dvb/frontends => dvb-frontends}/drxd.h | 0
.../{dvb/frontends => dvb-frontends}/drxd_firm.c | 0
.../{dvb/frontends => dvb-frontends}/drxd_firm.h | 0
.../{dvb/frontends => dvb-frontends}/drxd_hard.c | 0
.../frontends => dvb-frontends}/drxd_map_firm.h | 0
.../media/{dvb/frontends => dvb-frontends}/drxk.h | 0
.../{dvb/frontends => dvb-frontends}/drxk_hard.c | 0
.../{dvb/frontends => dvb-frontends}/drxk_hard.h | 0
.../{dvb/frontends => dvb-frontends}/drxk_map.h | 0
.../{dvb/frontends => dvb-frontends}/ds3000.c | 0
.../{dvb/frontends => dvb-frontends}/ds3000.h | 0
.../{dvb/frontends => dvb-frontends}/dvb-pll.c | 0
.../{dvb/frontends => dvb-frontends}/dvb-pll.h | 0
.../frontends => dvb-frontends}/dvb_dummy_fe.c | 0
.../frontends => dvb-frontends}/dvb_dummy_fe.h | 0
.../media/{dvb/frontends => dvb-frontends}/ec100.c | 0
.../media/{dvb/frontends => dvb-frontends}/ec100.h | 0
.../{dvb/frontends => dvb-frontends}/ec100_priv.h | 0
.../{dvb/frontends => dvb-frontends}/eds1547.h | 0
.../{dvb/frontends => dvb-frontends}/hd29l2.c | 0
.../{dvb/frontends => dvb-frontends}/hd29l2.h | 0
.../{dvb/frontends => dvb-frontends}/hd29l2_priv.h | 0
.../{dvb/frontends => dvb-frontends}/isl6405.c | 0
.../{dvb/frontends => dvb-frontends}/isl6405.h | 0
.../{dvb/frontends => dvb-frontends}/isl6421.c | 0
.../{dvb/frontends => dvb-frontends}/isl6421.h | 0
.../{dvb/frontends => dvb-frontends}/isl6423.c | 0
.../{dvb/frontends => dvb-frontends}/isl6423.h | 0
.../frontends => dvb-frontends}/it913x-fe-priv.h | 0
.../{dvb/frontends => dvb-frontends}/it913x-fe.c | 0
.../{dvb/frontends => dvb-frontends}/it913x-fe.h | 0
.../{dvb/frontends => dvb-frontends}/itd1000.c | 0
.../{dvb/frontends => dvb-frontends}/itd1000.h | 0
.../frontends => dvb-frontends}/itd1000_priv.h | 0
.../{dvb/frontends => dvb-frontends}/ix2505v.c | 0
.../{dvb/frontends => dvb-frontends}/ix2505v.h | 0
.../{dvb/frontends => dvb-frontends}/l64781.c | 0
.../{dvb/frontends => dvb-frontends}/l64781.h | 0
.../{dvb/frontends => dvb-frontends}/lg2160.c | 0
.../{dvb/frontends => dvb-frontends}/lg2160.h | 0
.../{dvb/frontends => dvb-frontends}/lgdt3305.c | 0
.../{dvb/frontends => dvb-frontends}/lgdt3305.h | 0
.../{dvb/frontends => dvb-frontends}/lgdt330x.c | 0
.../{dvb/frontends => dvb-frontends}/lgdt330x.h | 0
.../frontends => dvb-frontends}/lgdt330x_priv.h | 0
.../{dvb/frontends => dvb-frontends}/lgs8gl5.c | 0
.../{dvb/frontends => dvb-frontends}/lgs8gl5.h | 0
.../{dvb/frontends => dvb-frontends}/lgs8gxx.c | 0
.../{dvb/frontends => dvb-frontends}/lgs8gxx.h | 0
.../frontends => dvb-frontends}/lgs8gxx_priv.h | 0
.../{dvb/frontends => dvb-frontends}/lnbh24.h | 0
.../{dvb/frontends => dvb-frontends}/lnbp21.c | 0
.../{dvb/frontends => dvb-frontends}/lnbp21.h | 0
.../{dvb/frontends => dvb-frontends}/lnbp22.c | 0
.../{dvb/frontends => dvb-frontends}/lnbp22.h | 0
.../{dvb/frontends => dvb-frontends}/m88rs2000.c | 0
.../{dvb/frontends => dvb-frontends}/m88rs2000.h | 0
.../{dvb/frontends => dvb-frontends}/mb86a16.c | 0
.../{dvb/frontends => dvb-frontends}/mb86a16.h | 0
.../frontends => dvb-frontends}/mb86a16_priv.h | 0
.../{dvb/frontends => dvb-frontends}/mb86a20s.c | 0
.../{dvb/frontends => dvb-frontends}/mb86a20s.h | 0
.../media/{dvb/frontends => dvb-frontends}/mt312.c | 0
.../media/{dvb/frontends => dvb-frontends}/mt312.h | 0
.../{dvb/frontends => dvb-frontends}/mt312_priv.h | 0
.../media/{dvb/frontends => dvb-frontends}/mt352.c | 0
.../media/{dvb/frontends => dvb-frontends}/mt352.h | 0
.../{dvb/frontends => dvb-frontends}/mt352_priv.h | 0
.../{dvb/frontends => dvb-frontends}/nxt200x.c | 0
.../{dvb/frontends => dvb-frontends}/nxt200x.h | 0
.../{dvb/frontends => dvb-frontends}/nxt6000.c | 0
.../{dvb/frontends => dvb-frontends}/nxt6000.h | 0
.../frontends => dvb-frontends}/nxt6000_priv.h | 0
.../{dvb/frontends => dvb-frontends}/or51132.c | 0
.../{dvb/frontends => dvb-frontends}/or51132.h | 0
.../{dvb/frontends => dvb-frontends}/or51211.c | 0
.../{dvb/frontends => dvb-frontends}/or51211.h | 0
.../{dvb/frontends => dvb-frontends}/rtl2830.c | 0
.../{dvb/frontends => dvb-frontends}/rtl2830.h | 0
.../frontends => dvb-frontends}/rtl2830_priv.h | 0
.../{dvb/frontends => dvb-frontends}/s5h1409.c | 0
.../{dvb/frontends => dvb-frontends}/s5h1409.h | 0
.../{dvb/frontends => dvb-frontends}/s5h1411.c | 0
.../{dvb/frontends => dvb-frontends}/s5h1411.h | 0
.../{dvb/frontends => dvb-frontends}/s5h1420.c | 0
.../{dvb/frontends => dvb-frontends}/s5h1420.h | 0
.../frontends => dvb-frontends}/s5h1420_priv.h | 0
.../{dvb/frontends => dvb-frontends}/s5h1432.c | 0
.../{dvb/frontends => dvb-frontends}/s5h1432.h | 0
.../media/{dvb/frontends => dvb-frontends}/s921.c | 0
.../media/{dvb/frontends => dvb-frontends}/s921.h | 0
.../{dvb/frontends => dvb-frontends}/si21xx.c | 0
.../{dvb/frontends => dvb-frontends}/si21xx.h | 0
.../{dvb/frontends => dvb-frontends}/sp8870.c | 0
.../{dvb/frontends => dvb-frontends}/sp8870.h | 0
.../{dvb/frontends => dvb-frontends}/sp887x.c | 0
.../{dvb/frontends => dvb-frontends}/sp887x.h | 0
.../frontends => dvb-frontends}/stb0899_algo.c | 0
.../{dvb/frontends => dvb-frontends}/stb0899_cfg.h | 0
.../{dvb/frontends => dvb-frontends}/stb0899_drv.c | 0
.../{dvb/frontends => dvb-frontends}/stb0899_drv.h | 0
.../frontends => dvb-frontends}/stb0899_priv.h | 0
.../{dvb/frontends => dvb-frontends}/stb0899_reg.h | 0
.../{dvb/frontends => dvb-frontends}/stb6000.c | 0
.../{dvb/frontends => dvb-frontends}/stb6000.h | 0
.../{dvb/frontends => dvb-frontends}/stb6100.c | 0
.../{dvb/frontends => dvb-frontends}/stb6100.h | 0
.../{dvb/frontends => dvb-frontends}/stb6100_cfg.h | 0
.../frontends => dvb-frontends}/stb6100_proc.h | 0
.../{dvb/frontends => dvb-frontends}/stv0288.c | 0
.../{dvb/frontends => dvb-frontends}/stv0288.h | 0
.../{dvb/frontends => dvb-frontends}/stv0297.c | 0
.../{dvb/frontends => dvb-frontends}/stv0297.h | 0
.../{dvb/frontends => dvb-frontends}/stv0299.c | 0
.../{dvb/frontends => dvb-frontends}/stv0299.h | 0
.../{dvb/frontends => dvb-frontends}/stv0367.c | 0
.../{dvb/frontends => dvb-frontends}/stv0367.h | 0
.../frontends => dvb-frontends}/stv0367_priv.h | 0
.../frontends => dvb-frontends}/stv0367_regs.h | 0
.../{dvb/frontends => dvb-frontends}/stv0900.h | 0
.../frontends => dvb-frontends}/stv0900_core.c | 0
.../frontends => dvb-frontends}/stv0900_init.h | 0
.../frontends => dvb-frontends}/stv0900_priv.h | 0
.../{dvb/frontends => dvb-frontends}/stv0900_reg.h | 0
.../{dvb/frontends => dvb-frontends}/stv0900_sw.c | 0
.../{dvb/frontends => dvb-frontends}/stv090x.c | 0
.../{dvb/frontends => dvb-frontends}/stv090x.h | 0
.../frontends => dvb-frontends}/stv090x_priv.h | 0
.../{dvb/frontends => dvb-frontends}/stv090x_reg.h | 0
.../{dvb/frontends => dvb-frontends}/stv6110.c | 0
.../{dvb/frontends => dvb-frontends}/stv6110.h | 0
.../{dvb/frontends => dvb-frontends}/stv6110x.c | 0
.../{dvb/frontends => dvb-frontends}/stv6110x.h | 0
.../frontends => dvb-frontends}/stv6110x_priv.h | 0
.../frontends => dvb-frontends}/stv6110x_reg.h | 0
.../{dvb/frontends => dvb-frontends}/tda10021.c | 0
.../{dvb/frontends => dvb-frontends}/tda10023.c | 0
.../{dvb/frontends => dvb-frontends}/tda1002x.h | 0
.../{dvb/frontends => dvb-frontends}/tda10048.c | 0
.../{dvb/frontends => dvb-frontends}/tda10048.h | 0
.../{dvb/frontends => dvb-frontends}/tda1004x.c | 0
.../{dvb/frontends => dvb-frontends}/tda1004x.h | 0
.../{dvb/frontends => dvb-frontends}/tda10071.c | 0
.../{dvb/frontends => dvb-frontends}/tda10071.h | 0
.../frontends => dvb-frontends}/tda10071_priv.h | 0
.../{dvb/frontends => dvb-frontends}/tda10086.c | 0
.../{dvb/frontends => dvb-frontends}/tda10086.h | 0
.../frontends => dvb-frontends}/tda18271c2dd.c | 0
.../frontends => dvb-frontends}/tda18271c2dd.h | 0
.../tda18271c2dd_maps.h | 0
.../{dvb/frontends => dvb-frontends}/tda665x.c | 0
.../{dvb/frontends => dvb-frontends}/tda665x.h | 0
.../{dvb/frontends => dvb-frontends}/tda8083.c | 0
.../{dvb/frontends => dvb-frontends}/tda8083.h | 0
.../{dvb/frontends => dvb-frontends}/tda8261.c | 0
.../{dvb/frontends => dvb-frontends}/tda8261.h | 0
.../{dvb/frontends => dvb-frontends}/tda8261_cfg.h | 0
.../{dvb/frontends => dvb-frontends}/tda826x.c | 0
.../{dvb/frontends => dvb-frontends}/tda826x.h | 0
.../media/{dvb/frontends => dvb-frontends}/tdhd1.h | 0
.../{dvb/frontends => dvb-frontends}/tua6100.c | 0
.../{dvb/frontends => dvb-frontends}/tua6100.h | 0
.../{dvb/frontends => dvb-frontends}/ves1820.c | 0
.../{dvb/frontends => dvb-frontends}/ves1820.h | 0
.../{dvb/frontends => dvb-frontends}/ves1x93.c | 0
.../{dvb/frontends => dvb-frontends}/ves1x93.h | 0
.../{dvb/frontends => dvb-frontends}/z0194a.h | 0
.../{dvb/frontends => dvb-frontends}/zl10036.c | 0
.../{dvb/frontends => dvb-frontends}/zl10036.h | 0
.../{dvb/frontends => dvb-frontends}/zl10039.c | 0
.../{dvb/frontends => dvb-frontends}/zl10039.h | 0
.../{dvb/frontends => dvb-frontends}/zl10353.c | 0
.../{dvb/frontends => dvb-frontends}/zl10353.h | 0
.../frontends => dvb-frontends}/zl10353_priv.h | 0
drivers/media/dvb/Kconfig | 91 --------------------
drivers/media/dvb/Makefile | 21 -----
drivers/media/dvb/b2c2/Makefile | 16 ----
drivers/media/dvb/bt8xx/Makefile | 6 --
drivers/media/dvb/dm1105/Makefile | 3 -
drivers/media/dvb/pluto2/Makefile | 3 -
drivers/media/dvb/siano/Kconfig | 34 --------
drivers/media/dvb/ttusb-budget/Makefile | 3 -
drivers/media/{dvb => }/firewire/Kconfig | 0
drivers/media/{dvb => }/firewire/Makefile | 2 +-
drivers/media/{dvb => }/firewire/firedtv-avc.c | 0
drivers/media/{dvb => }/firewire/firedtv-ci.c | 0
drivers/media/{dvb => }/firewire/firedtv-dvb.c | 0
drivers/media/{dvb => }/firewire/firedtv-fe.c | 0
drivers/media/{dvb => }/firewire/firedtv-fw.c | 0
drivers/media/{dvb => }/firewire/firedtv-rc.c | 0
drivers/media/{dvb => }/firewire/firedtv.h | 0
drivers/media/mmc/Kconfig | 1 +
drivers/media/mmc/Makefile | 1 +
drivers/media/mmc/siano/Kconfig | 10 +++
drivers/media/mmc/siano/Makefile | 6 ++
drivers/media/{dvb => mmc}/siano/smssdio.c | 0
drivers/media/pci/Kconfig | 41 +++++++++
drivers/media/pci/Makefile | 14 +++
drivers/media/pci/b2c2/Kconfig | 6 ++
drivers/media/pci/b2c2/Makefile | 11 +++
drivers/media/{dvb => pci}/b2c2/flexcop-dma.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-pci.c | 0
drivers/media/{dvb => pci}/bt8xx/Kconfig | 0
drivers/media/pci/bt8xx/Makefile | 6 ++
drivers/media/{dvb => pci}/bt8xx/bt878.c | 0
drivers/media/{dvb => pci}/bt8xx/bt878.h | 0
drivers/media/{dvb => pci}/bt8xx/dst.c | 0
drivers/media/{dvb => pci}/bt8xx/dst_ca.c | 0
drivers/media/{dvb => pci}/bt8xx/dst_ca.h | 0
drivers/media/{dvb => pci}/bt8xx/dst_common.h | 0
drivers/media/{dvb => pci}/bt8xx/dst_priv.h | 0
drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c | 0
drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h | 0
drivers/media/{dvb => pci}/ddbridge/Kconfig | 0
drivers/media/{dvb => pci}/ddbridge/Makefile | 6 +-
.../media/{dvb => pci}/ddbridge/ddbridge-core.c | 0
.../media/{dvb => pci}/ddbridge/ddbridge-regs.h | 0
drivers/media/{dvb => pci}/ddbridge/ddbridge.h | 0
drivers/media/{dvb => pci}/dm1105/Kconfig | 0
drivers/media/pci/dm1105/Makefile | 3 +
drivers/media/{dvb => pci}/dm1105/dm1105.c | 0
drivers/media/{dvb => pci}/mantis/Kconfig | 0
drivers/media/{dvb => pci}/mantis/Makefile | 2 +-
drivers/media/{dvb => pci}/mantis/hopper_cards.c | 0
drivers/media/{dvb => pci}/mantis/hopper_vp3028.c | 0
drivers/media/{dvb => pci}/mantis/hopper_vp3028.h | 0
drivers/media/{dvb => pci}/mantis/mantis_ca.c | 0
drivers/media/{dvb => pci}/mantis/mantis_ca.h | 0
drivers/media/{dvb => pci}/mantis/mantis_cards.c | 0
drivers/media/{dvb => pci}/mantis/mantis_common.h | 0
drivers/media/{dvb => pci}/mantis/mantis_core.c | 0
drivers/media/{dvb => pci}/mantis/mantis_core.h | 0
drivers/media/{dvb => pci}/mantis/mantis_dma.c | 0
drivers/media/{dvb => pci}/mantis/mantis_dma.h | 0
drivers/media/{dvb => pci}/mantis/mantis_dvb.c | 0
drivers/media/{dvb => pci}/mantis/mantis_dvb.h | 0
drivers/media/{dvb => pci}/mantis/mantis_evm.c | 0
drivers/media/{dvb => pci}/mantis/mantis_hif.c | 0
drivers/media/{dvb => pci}/mantis/mantis_hif.h | 0
drivers/media/{dvb => pci}/mantis/mantis_i2c.c | 0
drivers/media/{dvb => pci}/mantis/mantis_i2c.h | 0
drivers/media/{dvb => pci}/mantis/mantis_input.c | 0
drivers/media/{dvb => pci}/mantis/mantis_ioc.c | 0
drivers/media/{dvb => pci}/mantis/mantis_ioc.h | 0
drivers/media/{dvb => pci}/mantis/mantis_link.h | 0
drivers/media/{dvb => pci}/mantis/mantis_pci.c | 0
drivers/media/{dvb => pci}/mantis/mantis_pci.h | 0
drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c | 0
drivers/media/{dvb => pci}/mantis/mantis_reg.h | 0
drivers/media/{dvb => pci}/mantis/mantis_uart.c | 0
drivers/media/{dvb => pci}/mantis/mantis_uart.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1033.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1033.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1034.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1034.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1041.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1041.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2033.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2033.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2040.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2040.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3028.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3028.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3030.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3030.h | 0
drivers/media/{dvb => pci}/ngene/Kconfig | 0
drivers/media/{dvb => pci}/ngene/Makefile | 6 +-
drivers/media/{dvb => pci}/ngene/ngene-cards.c | 0
drivers/media/{dvb => pci}/ngene/ngene-core.c | 0
drivers/media/{dvb => pci}/ngene/ngene-dvb.c | 0
drivers/media/{dvb => pci}/ngene/ngene-i2c.c | 0
drivers/media/{dvb => pci}/ngene/ngene.h | 0
drivers/media/{dvb => pci}/pluto2/Kconfig | 0
drivers/media/pci/pluto2/Makefile | 3 +
drivers/media/{dvb => pci}/pluto2/pluto2.c | 0
drivers/media/{dvb => pci}/pt1/Kconfig | 0
drivers/media/{dvb => pci}/pt1/Makefile | 2 +-
drivers/media/{dvb => pci}/pt1/pt1.c | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h | 0
drivers/media/{dvb => pci}/ttpci/Kconfig | 0
drivers/media/{dvb => pci}/ttpci/Makefile | 4 +-
drivers/media/{dvb => pci}/ttpci/av7110.c | 0
drivers/media/{dvb => pci}/ttpci/av7110.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_av.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_av.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_ca.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_ca.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_hw.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_hw.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_ipack.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_ipack.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_ir.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_v4l.c | 0
drivers/media/{dvb => pci}/ttpci/budget-av.c | 0
drivers/media/{dvb => pci}/ttpci/budget-ci.c | 0
drivers/media/{dvb => pci}/ttpci/budget-core.c | 0
drivers/media/{dvb => pci}/ttpci/budget-patch.c | 0
drivers/media/{dvb => pci}/ttpci/budget.c | 0
drivers/media/{dvb => pci}/ttpci/budget.h | 0
drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c | 0
drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h | 0
drivers/media/{common => }/tuners/Kconfig | 0
drivers/media/{common => }/tuners/Makefile | 4 +-
drivers/media/{common => }/tuners/fc0011.c | 0
drivers/media/{common => }/tuners/fc0011.h | 0
drivers/media/{common => }/tuners/fc0012-priv.h | 0
drivers/media/{common => }/tuners/fc0012.c | 0
drivers/media/{common => }/tuners/fc0012.h | 0
drivers/media/{common => }/tuners/fc0013-priv.h | 0
drivers/media/{common => }/tuners/fc0013.c | 0
drivers/media/{common => }/tuners/fc0013.h | 0
drivers/media/{common => }/tuners/fc001x-common.h | 0
drivers/media/{common => }/tuners/max2165.c | 0
drivers/media/{common => }/tuners/max2165.h | 0
drivers/media/{common => }/tuners/max2165_priv.h | 0
drivers/media/{common => }/tuners/mc44s803.c | 0
drivers/media/{common => }/tuners/mc44s803.h | 0
drivers/media/{common => }/tuners/mc44s803_priv.h | 0
drivers/media/{common => }/tuners/mt2060.c | 0
drivers/media/{common => }/tuners/mt2060.h | 0
drivers/media/{common => }/tuners/mt2060_priv.h | 0
drivers/media/{common => }/tuners/mt2063.c | 0
drivers/media/{common => }/tuners/mt2063.h | 0
drivers/media/{common => }/tuners/mt20xx.c | 0
drivers/media/{common => }/tuners/mt20xx.h | 0
drivers/media/{common => }/tuners/mt2131.c | 0
drivers/media/{common => }/tuners/mt2131.h | 0
drivers/media/{common => }/tuners/mt2131_priv.h | 0
drivers/media/{common => }/tuners/mt2266.c | 0
drivers/media/{common => }/tuners/mt2266.h | 0
drivers/media/{common => }/tuners/mxl5005s.c | 0
drivers/media/{common => }/tuners/mxl5005s.h | 0
drivers/media/{common => }/tuners/mxl5007t.c | 0
drivers/media/{common => }/tuners/mxl5007t.h | 0
drivers/media/{common => }/tuners/qt1010.c | 0
drivers/media/{common => }/tuners/qt1010.h | 0
drivers/media/{common => }/tuners/qt1010_priv.h | 0
drivers/media/{common => }/tuners/tda18212.c | 0
drivers/media/{common => }/tuners/tda18212.h | 0
drivers/media/{common => }/tuners/tda18218.c | 0
drivers/media/{common => }/tuners/tda18218.h | 0
drivers/media/{common => }/tuners/tda18218_priv.h | 0
.../media/{common => }/tuners/tda18271-common.c | 0
drivers/media/{common => }/tuners/tda18271-fe.c | 0
drivers/media/{common => }/tuners/tda18271-maps.c | 0
drivers/media/{common => }/tuners/tda18271-priv.h | 0
drivers/media/{common => }/tuners/tda18271.h | 0
drivers/media/{common => }/tuners/tda827x.c | 0
drivers/media/{common => }/tuners/tda827x.h | 0
drivers/media/{common => }/tuners/tda8290.c | 0
drivers/media/{common => }/tuners/tda8290.h | 0
drivers/media/{common => }/tuners/tda9887.c | 0
drivers/media/{common => }/tuners/tda9887.h | 0
drivers/media/{common => }/tuners/tea5761.c | 0
drivers/media/{common => }/tuners/tea5761.h | 0
drivers/media/{common => }/tuners/tea5767.c | 0
drivers/media/{common => }/tuners/tea5767.h | 0
drivers/media/{common => }/tuners/tua9001.c | 0
drivers/media/{common => }/tuners/tua9001.h | 0
drivers/media/{common => }/tuners/tua9001_priv.h | 0
drivers/media/{common => }/tuners/tuner-i2c.h | 0
drivers/media/{common => }/tuners/tuner-simple.c | 0
drivers/media/{common => }/tuners/tuner-simple.h | 0
drivers/media/{common => }/tuners/tuner-types.c | 0
.../media/{common => }/tuners/tuner-xc2028-types.h | 0
drivers/media/{common => }/tuners/tuner-xc2028.c | 0
drivers/media/{common => }/tuners/tuner-xc2028.h | 0
drivers/media/{common => }/tuners/xc4000.c | 0
drivers/media/{common => }/tuners/xc4000.h | 0
drivers/media/{common => }/tuners/xc5000.c | 0
drivers/media/{common => }/tuners/xc5000.h | 0
drivers/media/usb/Kconfig | 18 ++++
drivers/media/usb/Makefile | 6 ++
drivers/media/usb/b2c2/Kconfig | 6 ++
drivers/media/usb/b2c2/Makefile | 7 ++
drivers/media/{dvb => usb}/b2c2/flexcop-usb.c | 0
drivers/media/{dvb => usb}/b2c2/flexcop-usb.h | 0
drivers/media/{dvb => usb}/dvb-usb/Kconfig | 0
drivers/media/{dvb => usb}/dvb-usb/Makefile | 8 +-
drivers/media/{dvb => usb}/dvb-usb/a800.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005-script.h | 0
drivers/media/{dvb => usb}/dvb-usb/af9005.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005.h | 0
drivers/media/{dvb => usb}/dvb-usb/af9015.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9015.h | 0
drivers/media/{dvb => usb}/dvb-usb/af9035.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9035.h | 0
drivers/media/{dvb => usb}/dvb-usb/anysee.c | 0
drivers/media/{dvb => usb}/dvb-usb/anysee.h | 0
drivers/media/{dvb => usb}/dvb-usb/au6610.c | 0
drivers/media/{dvb => usb}/dvb-usb/au6610.h | 0
drivers/media/{dvb => usb}/dvb-usb/az6007.c | 0
drivers/media/{dvb => usb}/dvb-usb/az6027.c | 0
drivers/media/{dvb => usb}/dvb-usb/az6027.h | 0
drivers/media/{dvb => usb}/dvb-usb/ce6230.c | 0
drivers/media/{dvb => usb}/dvb-usb/ce6230.h | 0
.../media/{dvb => usb}/dvb-usb/cinergyT2-core.c | 0
drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h | 0
drivers/media/{dvb => usb}/dvb-usb/cxusb.c | 0
drivers/media/{dvb => usb}/dvb-usb/cxusb.h | 0
drivers/media/{dvb => usb}/dvb-usb/dib0700.h | 0
drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c | 0
.../media/{dvb => usb}/dvb-usb/dib0700_devices.c | 0
drivers/media/{dvb => usb}/dvb-usb/dib07x0.h | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb.h | 0
drivers/media/{dvb => usb}/dvb-usb/digitv.c | 0
drivers/media/{dvb => usb}/dvb-usb/digitv.h | 0
drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/dtt200u.c | 0
drivers/media/{dvb => usb}/dvb-usb/dtt200u.h | 0
drivers/media/{dvb => usb}/dvb-usb/dtv5100.c | 0
drivers/media/{dvb => usb}/dvb-usb/dtv5100.h | 0
.../media/{dvb => usb}/dvb-usb/dvb-usb-common.h | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c | 0
.../media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-ids.h | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c | 0
.../media/{dvb => usb}/dvb-usb/dvb-usb-remote.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h | 0
drivers/media/{dvb => usb}/dvb-usb/dw2102.c | 0
drivers/media/{dvb => usb}/dvb-usb/dw2102.h | 0
drivers/media/{dvb => usb}/dvb-usb/ec168.c | 0
drivers/media/{dvb => usb}/dvb-usb/ec168.h | 0
drivers/media/{dvb => usb}/dvb-usb/friio-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/friio.c | 0
drivers/media/{dvb => usb}/dvb-usb/friio.h | 0
drivers/media/{dvb => usb}/dvb-usb/gl861.c | 0
drivers/media/{dvb => usb}/dvb-usb/gl861.h | 0
drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/gp8psk.c | 0
drivers/media/{dvb => usb}/dvb-usb/gp8psk.h | 0
drivers/media/{dvb => usb}/dvb-usb/it913x.c | 0
drivers/media/{dvb => usb}/dvb-usb/lmedm04.c | 0
drivers/media/{dvb => usb}/dvb-usb/lmedm04.h | 0
drivers/media/{dvb => usb}/dvb-usb/m920x.c | 0
drivers/media/{dvb => usb}/dvb-usb/m920x.h | 0
.../media/{dvb => usb}/dvb-usb/mxl111sf-demod.c | 0
.../media/{dvb => usb}/dvb-usb/mxl111sf-demod.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-reg.h | 0
.../media/{dvb => usb}/dvb-usb/mxl111sf-tuner.c | 0
.../media/{dvb => usb}/dvb-usb/mxl111sf-tuner.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf.h | 0
drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c | 0
drivers/media/{dvb => usb}/dvb-usb/opera1.c | 0
drivers/media/{dvb => usb}/dvb-usb/pctv452e.c | 0
drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.c | 0
drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.h | 0
.../media/{dvb => usb}/dvb-usb/technisat-usb2.c | 0
drivers/media/{dvb => usb}/dvb-usb/ttusb2.c | 0
drivers/media/{dvb => usb}/dvb-usb/ttusb2.h | 0
drivers/media/{dvb => usb}/dvb-usb/umt-010.c | 0
drivers/media/{dvb => usb}/dvb-usb/usb-urb.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp702x.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp702x.h | 0
drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp7045.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp7045.h | 0
drivers/media/usb/siano/Kconfig | 10 +++
drivers/media/usb/siano/Makefile | 6 ++
drivers/media/{dvb => usb}/siano/smsusb.c | 0
drivers/media/{dvb => usb}/ttusb-budget/Kconfig | 0
drivers/media/usb/ttusb-budget/Makefile | 3 +
.../{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c | 0
drivers/media/{dvb => usb}/ttusb-dec/Kconfig | 0
drivers/media/{dvb => usb}/ttusb-dec/Makefile | 2 +-
drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c | 0
drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c | 0
drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h | 0
drivers/media/v4l2-core/Kconfig | 60 +++++++++++++
drivers/media/v4l2-core/Makefile | 35 ++++++++
drivers/media/{video => v4l2-core}/tuner-core.c | 0
drivers/media/{video => v4l2-core}/v4l2-common.c | 0
.../{video => v4l2-core}/v4l2-compat-ioctl32.c | 0
drivers/media/{video => v4l2-core}/v4l2-ctrls.c | 0
drivers/media/{video => v4l2-core}/v4l2-dev.c | 0
drivers/media/{video => v4l2-core}/v4l2-device.c | 0
drivers/media/{video => v4l2-core}/v4l2-event.c | 0
drivers/media/{video => v4l2-core}/v4l2-fh.c | 0
.../media/{video => v4l2-core}/v4l2-int-device.c | 0
drivers/media/{video => v4l2-core}/v4l2-ioctl.c | 0
drivers/media/{video => v4l2-core}/v4l2-mem2mem.c | 0
drivers/media/{video => v4l2-core}/v4l2-subdev.c | 0
drivers/media/{video => v4l2-core}/videobuf-core.c | 0
.../{video => v4l2-core}/videobuf-dma-contig.c | 0
.../media/{video => v4l2-core}/videobuf-dma-sg.c | 0
drivers/media/{video => v4l2-core}/videobuf-dvb.c | 0
.../media/{video => v4l2-core}/videobuf-vmalloc.c | 0
.../media/{video => v4l2-core}/videobuf2-core.c | 0
.../{video => v4l2-core}/videobuf2-dma-contig.c | 0
.../media/{video => v4l2-core}/videobuf2-dma-sg.c | 0
.../media/{video => v4l2-core}/videobuf2-memops.c | 0
.../media/{video => v4l2-core}/videobuf2-vmalloc.c | 0
drivers/media/video/Kconfig | 56 ------------
drivers/media/video/Makefile | 33 +------
drivers/media/video/au0828/Makefile | 6 +-
drivers/media/video/bt8xx/Makefile | 4 +-
drivers/media/video/cx18/Makefile | 6 +-
drivers/media/video/cx231xx/Makefile | 8 +-
drivers/media/video/cx23885/Makefile | 6 +-
drivers/media/video/cx25821/Makefile | 6 +-
drivers/media/video/cx88/Makefile | 6 +-
drivers/media/video/em28xx/Makefile | 6 +-
drivers/media/video/ivtv/Makefile | 6 +-
drivers/media/video/pvrusb2/Makefile | 6 +-
drivers/media/video/saa7134/Makefile | 6 +-
drivers/media/video/saa7164/Makefile | 6 +-
drivers/media/video/tlg2300/Makefile | 6 +-
drivers/media/video/tm6000/Makefile | 6 +-
drivers/media/video/usbvision/Makefile | 2 +-
drivers/staging/media/as102/Makefile | 2 +-
drivers/staging/media/cxd2099/Makefile | 6 +-
drivers/staging/media/go7007/Makefile | 6 +-
653 files changed, 425 insertions(+), 379 deletions(-)
rename drivers/media/{dvb => common}/b2c2/Kconfig (64%)
create mode 100644 drivers/media/common/b2c2/Makefile
rename drivers/media/{dvb => common}/b2c2/flexcop-common.h (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop-eeprom.c (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop-fe-tuner.c (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop-hw-filter.c (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop-i2c.c (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop-misc.c (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop-reg.h (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop-sram.c (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop.c (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop.h (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_be.h (100%)
rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_le.h (100%)
create mode 100644 drivers/media/common/saa7146/Kconfig
create mode 100644 drivers/media/common/saa7146/Makefile
rename drivers/media/common/{ => saa7146}/saa7146_core.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_fops.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_hlp.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_i2c.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_vbi.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_video.c (100%)
create mode 100644 drivers/media/common/siano/Kconfig
rename drivers/media/{dvb => common}/siano/Makefile (57%)
rename drivers/media/{dvb => common}/siano/sms-cards.c (100%)
rename drivers/media/{dvb => common}/siano/sms-cards.h (100%)
rename drivers/media/{dvb => common}/siano/smscoreapi.c (100%)
rename drivers/media/{dvb => common}/siano/smscoreapi.h (100%)
rename drivers/media/{dvb => common}/siano/smsdvb.c (100%)
rename drivers/media/{dvb => common}/siano/smsendian.c (100%)
rename drivers/media/{dvb => common}/siano/smsendian.h (100%)
rename drivers/media/{dvb => common}/siano/smsir.c (100%)
rename drivers/media/{dvb => common}/siano/smsir.h (100%)
create mode 100644 drivers/media/dvb-core/Kconfig
rename drivers/media/{dvb => }/dvb-core/Makefile (100%)
rename drivers/media/{dvb => }/dvb-core/demux.h (100%)
rename drivers/media/{dvb => }/dvb-core/dmxdev.c (100%)
rename drivers/media/{dvb => }/dvb-core/dmxdev.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_demux.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_demux.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_filter.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_filter.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_frontend.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_frontend.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_math.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_math.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_net.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_net.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvbdev.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvbdev.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/Kconfig (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/Makefile (97%)
rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ec100_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s921.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s921.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h (100%)
delete mode 100644 drivers/media/dvb/Kconfig
delete mode 100644 drivers/media/dvb/Makefile
delete mode 100644 drivers/media/dvb/b2c2/Makefile
delete mode 100644 drivers/media/dvb/bt8xx/Makefile
delete mode 100644 drivers/media/dvb/dm1105/Makefile
delete mode 100644 drivers/media/dvb/pluto2/Makefile
delete mode 100644 drivers/media/dvb/siano/Kconfig
delete mode 100644 drivers/media/dvb/ttusb-budget/Makefile
rename drivers/media/{dvb => }/firewire/Kconfig (100%)
rename drivers/media/{dvb => }/firewire/Makefile (80%)
rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
create mode 100644 drivers/media/mmc/Kconfig
create mode 100644 drivers/media/mmc/Makefile
create mode 100644 drivers/media/mmc/siano/Kconfig
create mode 100644 drivers/media/mmc/siano/Makefile
rename drivers/media/{dvb => mmc}/siano/smssdio.c (100%)
create mode 100644 drivers/media/pci/Kconfig
create mode 100644 drivers/media/pci/Makefile
create mode 100644 drivers/media/pci/b2c2/Kconfig
create mode 100644 drivers/media/pci/b2c2/Makefile
rename drivers/media/{dvb => pci}/b2c2/flexcop-dma.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-pci.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/Kconfig (100%)
create mode 100644 drivers/media/pci/bt8xx/Makefile
rename drivers/media/{dvb => pci}/bt8xx/bt878.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/bt878.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_ca.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_ca.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_common.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_priv.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h (100%)
rename drivers/media/{dvb => pci}/ddbridge/Kconfig (100%)
rename drivers/media/{dvb => pci}/ddbridge/Makefile (61%)
rename drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c (100%)
rename drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h (100%)
rename drivers/media/{dvb => pci}/ddbridge/ddbridge.h (100%)
rename drivers/media/{dvb => pci}/dm1105/Kconfig (100%)
create mode 100644 drivers/media/pci/dm1105/Makefile
rename drivers/media/{dvb => pci}/dm1105/dm1105.c (100%)
rename drivers/media/{dvb => pci}/mantis/Kconfig (100%)
rename drivers/media/{dvb => pci}/mantis/Makefile (88%)
rename drivers/media/{dvb => pci}/mantis/hopper_cards.c (100%)
rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.c (100%)
rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ca.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ca.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_cards.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_common.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_core.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_core.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dma.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dma.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dvb.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dvb.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_evm.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_hif.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_hif.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_i2c.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_i2c.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_input.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ioc.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ioc.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_link.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_pci.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_pci.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_reg.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_uart.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_uart.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.h (100%)
rename drivers/media/{dvb => pci}/ngene/Kconfig (100%)
rename drivers/media/{dvb => pci}/ngene/Makefile (63%)
rename drivers/media/{dvb => pci}/ngene/ngene-cards.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene-core.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene-dvb.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene-i2c.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene.h (100%)
rename drivers/media/{dvb => pci}/pluto2/Kconfig (100%)
create mode 100644 drivers/media/pci/pluto2/Makefile
rename drivers/media/{dvb => pci}/pluto2/pluto2.c (100%)
rename drivers/media/{dvb => pci}/pt1/Kconfig (100%)
rename drivers/media/{dvb => pci}/pt1/Makefile (56%)
rename drivers/media/{dvb => pci}/pt1/pt1.c (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h (100%)
rename drivers/media/{dvb => pci}/ttpci/Kconfig (100%)
rename drivers/media/{dvb => pci}/ttpci/Makefile (82%)
rename drivers/media/{dvb => pci}/ttpci/av7110.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_av.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_av.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ca.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ca.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_hw.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_hw.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ir.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_v4l.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-av.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-ci.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-core.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-patch.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget.h (100%)
rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c (100%)
rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h (100%)
rename drivers/media/{common => }/tuners/Kconfig (100%)
rename drivers/media/{common => }/tuners/Makefile (93%)
rename drivers/media/{common => }/tuners/fc0011.c (100%)
rename drivers/media/{common => }/tuners/fc0011.h (100%)
rename drivers/media/{common => }/tuners/fc0012-priv.h (100%)
rename drivers/media/{common => }/tuners/fc0012.c (100%)
rename drivers/media/{common => }/tuners/fc0012.h (100%)
rename drivers/media/{common => }/tuners/fc0013-priv.h (100%)
rename drivers/media/{common => }/tuners/fc0013.c (100%)
rename drivers/media/{common => }/tuners/fc0013.h (100%)
rename drivers/media/{common => }/tuners/fc001x-common.h (100%)
rename drivers/media/{common => }/tuners/max2165.c (100%)
rename drivers/media/{common => }/tuners/max2165.h (100%)
rename drivers/media/{common => }/tuners/max2165_priv.h (100%)
rename drivers/media/{common => }/tuners/mc44s803.c (100%)
rename drivers/media/{common => }/tuners/mc44s803.h (100%)
rename drivers/media/{common => }/tuners/mc44s803_priv.h (100%)
rename drivers/media/{common => }/tuners/mt2060.c (100%)
rename drivers/media/{common => }/tuners/mt2060.h (100%)
rename drivers/media/{common => }/tuners/mt2060_priv.h (100%)
rename drivers/media/{common => }/tuners/mt2063.c (100%)
rename drivers/media/{common => }/tuners/mt2063.h (100%)
rename drivers/media/{common => }/tuners/mt20xx.c (100%)
rename drivers/media/{common => }/tuners/mt20xx.h (100%)
rename drivers/media/{common => }/tuners/mt2131.c (100%)
rename drivers/media/{common => }/tuners/mt2131.h (100%)
rename drivers/media/{common => }/tuners/mt2131_priv.h (100%)
rename drivers/media/{common => }/tuners/mt2266.c (100%)
rename drivers/media/{common => }/tuners/mt2266.h (100%)
rename drivers/media/{common => }/tuners/mxl5005s.c (100%)
rename drivers/media/{common => }/tuners/mxl5005s.h (100%)
rename drivers/media/{common => }/tuners/mxl5007t.c (100%)
rename drivers/media/{common => }/tuners/mxl5007t.h (100%)
rename drivers/media/{common => }/tuners/qt1010.c (100%)
rename drivers/media/{common => }/tuners/qt1010.h (100%)
rename drivers/media/{common => }/tuners/qt1010_priv.h (100%)
rename drivers/media/{common => }/tuners/tda18212.c (100%)
rename drivers/media/{common => }/tuners/tda18212.h (100%)
rename drivers/media/{common => }/tuners/tda18218.c (100%)
rename drivers/media/{common => }/tuners/tda18218.h (100%)
rename drivers/media/{common => }/tuners/tda18218_priv.h (100%)
rename drivers/media/{common => }/tuners/tda18271-common.c (100%)
rename drivers/media/{common => }/tuners/tda18271-fe.c (100%)
rename drivers/media/{common => }/tuners/tda18271-maps.c (100%)
rename drivers/media/{common => }/tuners/tda18271-priv.h (100%)
rename drivers/media/{common => }/tuners/tda18271.h (100%)
rename drivers/media/{common => }/tuners/tda827x.c (100%)
rename drivers/media/{common => }/tuners/tda827x.h (100%)
rename drivers/media/{common => }/tuners/tda8290.c (100%)
rename drivers/media/{common => }/tuners/tda8290.h (100%)
rename drivers/media/{common => }/tuners/tda9887.c (100%)
rename drivers/media/{common => }/tuners/tda9887.h (100%)
rename drivers/media/{common => }/tuners/tea5761.c (100%)
rename drivers/media/{common => }/tuners/tea5761.h (100%)
rename drivers/media/{common => }/tuners/tea5767.c (100%)
rename drivers/media/{common => }/tuners/tea5767.h (100%)
rename drivers/media/{common => }/tuners/tua9001.c (100%)
rename drivers/media/{common => }/tuners/tua9001.h (100%)
rename drivers/media/{common => }/tuners/tua9001_priv.h (100%)
rename drivers/media/{common => }/tuners/tuner-i2c.h (100%)
rename drivers/media/{common => }/tuners/tuner-simple.c (100%)
rename drivers/media/{common => }/tuners/tuner-simple.h (100%)
rename drivers/media/{common => }/tuners/tuner-types.c (100%)
rename drivers/media/{common => }/tuners/tuner-xc2028-types.h (100%)
rename drivers/media/{common => }/tuners/tuner-xc2028.c (100%)
rename drivers/media/{common => }/tuners/tuner-xc2028.h (100%)
rename drivers/media/{common => }/tuners/xc4000.c (100%)
rename drivers/media/{common => }/tuners/xc4000.h (100%)
rename drivers/media/{common => }/tuners/xc5000.c (100%)
rename drivers/media/{common => }/tuners/xc5000.h (100%)
create mode 100644 drivers/media/usb/Kconfig
create mode 100644 drivers/media/usb/Makefile
create mode 100644 drivers/media/usb/b2c2/Kconfig
create mode 100644 drivers/media/usb/b2c2/Makefile
rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.c (100%)
rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/Kconfig (100%)
rename drivers/media/{dvb => usb}/dvb-usb/Makefile (94%)
rename drivers/media/{dvb => usb}/dvb-usb/a800.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005-script.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9015.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9015.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9035.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9035.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/anysee.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/anysee.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/au6610.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/au6610.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/az6007.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/az6027.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/az6027.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ce6230.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ce6230.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cxusb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cxusb.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib0700.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib07x0.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/digitv.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/digitv.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-ids.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dw2102.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dw2102.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ec168.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ec168.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/friio-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/friio.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/friio.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gl861.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gl861.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/it913x.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/lmedm04.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/lmedm04.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/m920x.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/m920x.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-demod.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-demod.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-reg.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-tuner.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-tuner.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/opera1.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/pctv452e.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/umt-010.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/usb-urb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp702x.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp702x.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp7045.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp7045.h (100%)
create mode 100644 drivers/media/usb/siano/Kconfig
create mode 100644 drivers/media/usb/siano/Makefile
rename drivers/media/{dvb => usb}/siano/smsusb.c (100%)
rename drivers/media/{dvb => usb}/ttusb-budget/Kconfig (100%)
create mode 100644 drivers/media/usb/ttusb-budget/Makefile
rename drivers/media/{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/Kconfig (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/Makefile (57%)
rename drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h (100%)
create mode 100644 drivers/media/v4l2-core/Kconfig
create mode 100644 drivers/media/v4l2-core/Makefile
rename drivers/media/{video => v4l2-core}/tuner-core.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-common.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-compat-ioctl32.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-ctrls.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-dev.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-device.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-event.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-fh.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-int-device.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-ioctl.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-mem2mem.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-subdev.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-core.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-dma-contig.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-dma-sg.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-dvb.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-vmalloc.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-core.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-dma-contig.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-dma-sg.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-memops.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-vmalloc.c (100%)
--
1.7.10.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH RFC 01/10] [media] v4l: move v4l2 core into a separate directory
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 02/10] [media] dvb: move the dvb core one level up Mauro Carvalho Chehab
` (9 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
Currently, the v4l2 core is mixed together with other non-core drivers.
Move them into a separate directory.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/Kconfig | 1 +
drivers/media/Makefile | 2 +-
drivers/media/v4l2-core/Kconfig | 60 ++++++++++++++++++++
drivers/media/v4l2-core/Makefile | 35 ++++++++++++
drivers/media/{video => v4l2-core}/tuner-core.c | 0
drivers/media/{video => v4l2-core}/v4l2-common.c | 0
.../{video => v4l2-core}/v4l2-compat-ioctl32.c | 0
drivers/media/{video => v4l2-core}/v4l2-ctrls.c | 0
drivers/media/{video => v4l2-core}/v4l2-dev.c | 0
drivers/media/{video => v4l2-core}/v4l2-device.c | 0
drivers/media/{video => v4l2-core}/v4l2-event.c | 0
drivers/media/{video => v4l2-core}/v4l2-fh.c | 0
.../media/{video => v4l2-core}/v4l2-int-device.c | 0
drivers/media/{video => v4l2-core}/v4l2-ioctl.c | 0
drivers/media/{video => v4l2-core}/v4l2-mem2mem.c | 0
drivers/media/{video => v4l2-core}/v4l2-subdev.c | 0
drivers/media/{video => v4l2-core}/videobuf-core.c | 0
.../{video => v4l2-core}/videobuf-dma-contig.c | 0
.../media/{video => v4l2-core}/videobuf-dma-sg.c | 0
drivers/media/{video => v4l2-core}/videobuf-dvb.c | 0
.../media/{video => v4l2-core}/videobuf-vmalloc.c | 0
.../media/{video => v4l2-core}/videobuf2-core.c | 0
.../{video => v4l2-core}/videobuf2-dma-contig.c | 0
.../media/{video => v4l2-core}/videobuf2-dma-sg.c | 0
.../media/{video => v4l2-core}/videobuf2-memops.c | 0
.../media/{video => v4l2-core}/videobuf2-vmalloc.c | 0
drivers/media/video/Kconfig | 56 ------------------
drivers/media/video/Makefile | 27 ---------
28 files changed, 97 insertions(+), 84 deletions(-)
create mode 100644 drivers/media/v4l2-core/Kconfig
create mode 100644 drivers/media/v4l2-core/Makefile
rename drivers/media/{video => v4l2-core}/tuner-core.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-common.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-compat-ioctl32.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-ctrls.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-dev.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-device.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-event.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-fh.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-int-device.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-ioctl.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-mem2mem.c (100%)
rename drivers/media/{video => v4l2-core}/v4l2-subdev.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-core.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-dma-contig.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-dma-sg.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-dvb.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf-vmalloc.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-core.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-dma-contig.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-dma-sg.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-memops.c (100%)
rename drivers/media/{video => v4l2-core}/videobuf2-vmalloc.c (100%)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 2f5b395..8bb3b66 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -154,6 +154,7 @@ source "drivers/media/common/tuners/Kconfig"
# Video/Radio/Hybrid adapters
#
+source "drivers/media/v4l2-core/Kconfig"
source "drivers/media/video/Kconfig"
source "drivers/media/radio/Kconfig"
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 64755c9..2f9abaa 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
obj-$(CONFIG_MEDIA_SUPPORT) += media.o
endif
-obj-y += common/ rc/ video/
+obj-y += v4l2-core/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb/
diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
new file mode 100644
index 0000000..6f53337
--- /dev/null
+++ b/drivers/media/v4l2-core/Kconfig
@@ -0,0 +1,60 @@
+#
+# Generic video config states
+#
+
+config VIDEO_V4L2
+ tristate
+ depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+ default y
+
+config VIDEOBUF_GEN
+ tristate
+
+config VIDEOBUF_DMA_SG
+ depends on HAS_DMA
+ select VIDEOBUF_GEN
+ tristate
+
+config VIDEOBUF_VMALLOC
+ select VIDEOBUF_GEN
+ tristate
+
+config VIDEOBUF_DMA_CONTIG
+ depends on HAS_DMA
+ select VIDEOBUF_GEN
+ tristate
+
+config VIDEOBUF_DVB
+ tristate
+ select VIDEOBUF_GEN
+
+config VIDEO_TUNER
+ tristate
+ depends on MEDIA_TUNER
+
+config V4L2_MEM2MEM_DEV
+ tristate
+ depends on VIDEOBUF2_CORE
+
+config VIDEOBUF2_CORE
+ tristate
+
+config VIDEOBUF2_MEMOPS
+ tristate
+
+config VIDEOBUF2_DMA_CONTIG
+ select VIDEOBUF2_CORE
+ select VIDEOBUF2_MEMOPS
+ tristate
+
+config VIDEOBUF2_VMALLOC
+ select VIDEOBUF2_CORE
+ select VIDEOBUF2_MEMOPS
+ tristate
+
+config VIDEOBUF2_DMA_SG
+ #depends on HAS_DMA
+ select VIDEOBUF2_CORE
+ select VIDEOBUF2_MEMOPS
+ tristate
+
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
new file mode 100644
index 0000000..7319c27
--- /dev/null
+++ b/drivers/media/v4l2-core/Makefile
@@ -0,0 +1,35 @@
+#
+# Makefile for the V4L2 core
+#
+
+tuner-objs := tuner-core.o
+
+videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \
+ v4l2-event.o v4l2-ctrls.o v4l2-subdev.o
+ifeq ($(CONFIG_COMPAT),y)
+ videodev-objs += v4l2-compat-ioctl32.o
+endif
+
+obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o
+obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
+
+obj-$(CONFIG_VIDEO_TUNER) += tuner.o
+
+obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
+
+obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
+obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
+obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
+obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
+obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o
+
+obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o
+obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o
+obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
+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/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/common/tuners
+
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
similarity index 100%
rename from drivers/media/video/tuner-core.c
rename to drivers/media/v4l2-core/tuner-core.c
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
similarity index 100%
rename from drivers/media/video/v4l2-common.c
rename to drivers/media/v4l2-core/v4l2-common.c
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
similarity index 100%
rename from drivers/media/video/v4l2-compat-ioctl32.c
rename to drivers/media/v4l2-core/v4l2-compat-ioctl32.c
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
similarity index 100%
rename from drivers/media/video/v4l2-ctrls.c
rename to drivers/media/v4l2-core/v4l2-ctrls.c
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
similarity index 100%
rename from drivers/media/video/v4l2-dev.c
rename to drivers/media/v4l2-core/v4l2-dev.c
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
similarity index 100%
rename from drivers/media/video/v4l2-device.c
rename to drivers/media/v4l2-core/v4l2-device.c
diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c
similarity index 100%
rename from drivers/media/video/v4l2-event.c
rename to drivers/media/v4l2-core/v4l2-event.c
diff --git a/drivers/media/video/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c
similarity index 100%
rename from drivers/media/video/v4l2-fh.c
rename to drivers/media/v4l2-core/v4l2-fh.c
diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/v4l2-core/v4l2-int-device.c
similarity index 100%
rename from drivers/media/video/v4l2-int-device.c
rename to drivers/media/v4l2-core/v4l2-int-device.c
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
similarity index 100%
rename from drivers/media/video/v4l2-ioctl.c
rename to drivers/media/v4l2-core/v4l2-ioctl.c
diff --git a/drivers/media/video/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
similarity index 100%
rename from drivers/media/video/v4l2-mem2mem.c
rename to drivers/media/v4l2-core/v4l2-mem2mem.c
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
similarity index 100%
rename from drivers/media/video/v4l2-subdev.c
rename to drivers/media/v4l2-core/v4l2-subdev.c
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
similarity index 100%
rename from drivers/media/video/videobuf-core.c
rename to drivers/media/v4l2-core/videobuf-core.c
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/v4l2-core/videobuf-dma-contig.c
similarity index 100%
rename from drivers/media/video/videobuf-dma-contig.c
rename to drivers/media/v4l2-core/videobuf-dma-contig.c
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
similarity index 100%
rename from drivers/media/video/videobuf-dma-sg.c
rename to drivers/media/v4l2-core/videobuf-dma-sg.c
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/v4l2-core/videobuf-dvb.c
similarity index 100%
rename from drivers/media/video/videobuf-dvb.c
rename to drivers/media/v4l2-core/videobuf-dvb.c
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/v4l2-core/videobuf-vmalloc.c
similarity index 100%
rename from drivers/media/video/videobuf-vmalloc.c
rename to drivers/media/v4l2-core/videobuf-vmalloc.c
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
similarity index 100%
rename from drivers/media/video/videobuf2-core.c
rename to drivers/media/v4l2-core/videobuf2-core.c
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
similarity index 100%
rename from drivers/media/video/videobuf2-dma-contig.c
rename to drivers/media/v4l2-core/videobuf2-dma-contig.c
diff --git a/drivers/media/video/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
similarity index 100%
rename from drivers/media/video/videobuf2-dma-sg.c
rename to drivers/media/v4l2-core/videobuf2-dma-sg.c
diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/v4l2-core/videobuf2-memops.c
similarity index 100%
rename from drivers/media/video/videobuf2-memops.c
rename to drivers/media/v4l2-core/videobuf2-memops.c
diff --git a/drivers/media/video/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
similarity index 100%
rename from drivers/media/video/videobuf2-vmalloc.c
rename to drivers/media/v4l2-core/videobuf2-vmalloc.c
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index c3ef5e4..2d51f52 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -2,32 +2,6 @@
# Generic video config states
#
-config VIDEO_V4L2
- tristate
- depends on VIDEO_DEV && VIDEO_V4L2_COMMON
- default y
-
-config VIDEOBUF_GEN
- tristate
-
-config VIDEOBUF_DMA_SG
- depends on HAS_DMA
- select VIDEOBUF_GEN
- tristate
-
-config VIDEOBUF_VMALLOC
- select VIDEOBUF_GEN
- tristate
-
-config VIDEOBUF_DMA_CONTIG
- depends on HAS_DMA
- select VIDEOBUF_GEN
- tristate
-
-config VIDEOBUF_DVB
- tristate
- select VIDEOBUF_GEN
-
config VIDEO_BTCX
depends on PCI
tristate
@@ -36,36 +10,6 @@ config VIDEO_TVEEPROM
tristate
depends on I2C
-config VIDEO_TUNER
- tristate
- depends on MEDIA_TUNER
-
-config V4L2_MEM2MEM_DEV
- tristate
- depends on VIDEOBUF2_CORE
-
-config VIDEOBUF2_CORE
- tristate
-
-config VIDEOBUF2_MEMOPS
- tristate
-
-config VIDEOBUF2_DMA_CONTIG
- select VIDEOBUF2_CORE
- select VIDEOBUF2_MEMOPS
- tristate
-
-config VIDEOBUF2_VMALLOC
- select VIDEOBUF2_CORE
- select VIDEOBUF2_MEMOPS
- tristate
-
-
-config VIDEOBUF2_DMA_SG
- #depends on HAS_DMA
- select VIDEOBUF2_CORE
- select VIDEOBUF2_MEMOPS
- tristate
#
# Multimedia Video device configuration
#
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index d209de0..088d834 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -2,32 +2,18 @@
# Makefile for the video capture/playback device drivers.
#
-tuner-objs := tuner-core.o
-
msp3400-objs := msp3400-driver.o msp3400-kthreads.o
stkwebcam-objs := stk-webcam.o stk-sensor.o
omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
-videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \
- v4l2-event.o v4l2-ctrls.o v4l2-subdev.o
-ifeq ($(CONFIG_COMPAT),y)
- videodev-objs += v4l2-compat-ioctl32.o
-endif
-
-# V4L2 core modules
-
-obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o
-obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
-
# Helper modules
obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
# All i2c modules must come first:
-obj-$(CONFIG_VIDEO_TUNER) += tuner.o
obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o
@@ -126,21 +112,8 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
obj-$(CONFIG_STA2X11_VIP) += sta2x11_vip.o
obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o
-obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
-obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
-obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
-obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
-obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o
obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o
-obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o
-obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o
-obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
-obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
-obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
-
-obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
-
obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 02/10] [media] dvb: move the dvb core one level up
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 01/10] [media] v4l: move v4l2 core into a separate directory Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 03/10] [media] move the dvb/frontends to drivers/media/dvb-frontends Mauro Carvalho Chehab
` (8 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
just like the V4L2 core, move the DVB core to drivers/media, as the
intention is to get rid of both "video" and "dvb" directories.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/Kconfig | 1 +
drivers/media/Makefile | 2 +-
drivers/media/common/tuners/Makefile | 2 +-
drivers/media/dvb-core/Kconfig | 29 +++++++++++++++++++++
drivers/media/{dvb => }/dvb-core/Makefile | 0
drivers/media/{dvb => }/dvb-core/demux.h | 0
drivers/media/{dvb => }/dvb-core/dmxdev.c | 0
drivers/media/{dvb => }/dvb-core/dmxdev.h | 0
drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c | 0
drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h | 0
drivers/media/{dvb => }/dvb-core/dvb_demux.c | 0
drivers/media/{dvb => }/dvb-core/dvb_demux.h | 0
drivers/media/{dvb => }/dvb-core/dvb_filter.c | 0
drivers/media/{dvb => }/dvb-core/dvb_filter.h | 0
drivers/media/{dvb => }/dvb-core/dvb_frontend.c | 0
drivers/media/{dvb => }/dvb-core/dvb_frontend.h | 0
drivers/media/{dvb => }/dvb-core/dvb_math.c | 0
drivers/media/{dvb => }/dvb-core/dvb_math.h | 0
drivers/media/{dvb => }/dvb-core/dvb_net.c | 0
drivers/media/{dvb => }/dvb-core/dvb_net.h | 0
drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c | 0
drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h | 0
drivers/media/{dvb => }/dvb-core/dvbdev.c | 0
drivers/media/{dvb => }/dvb-core/dvbdev.h | 0
drivers/media/dvb/Kconfig | 26 ------------------
drivers/media/dvb/Makefile | 3 +--
drivers/media/dvb/b2c2/Makefile | 2 +-
drivers/media/dvb/bt8xx/Makefile | 2 +-
drivers/media/dvb/ddbridge/Makefile | 2 +-
drivers/media/dvb/dm1105/Makefile | 2 +-
drivers/media/dvb/dvb-usb/Makefile | 2 +-
drivers/media/dvb/firewire/Makefile | 2 +-
drivers/media/dvb/frontends/Makefile | 2 +-
drivers/media/dvb/mantis/Makefile | 2 +-
drivers/media/dvb/ngene/Makefile | 2 +-
drivers/media/dvb/pluto2/Makefile | 2 +-
drivers/media/dvb/pt1/Makefile | 2 +-
drivers/media/dvb/siano/Makefile | 2 +-
drivers/media/dvb/ttpci/Makefile | 2 +-
drivers/media/dvb/ttusb-budget/Makefile | 2 +-
drivers/media/dvb/ttusb-dec/Makefile | 2 +-
drivers/media/v4l2-core/Makefile | 2 +-
drivers/media/video/Makefile | 2 +-
drivers/media/video/au0828/Makefile | 2 +-
drivers/media/video/bt8xx/Makefile | 2 +-
drivers/media/video/cx18/Makefile | 2 +-
drivers/media/video/cx231xx/Makefile | 2 +-
drivers/media/video/cx23885/Makefile | 2 +-
drivers/media/video/cx25821/Makefile | 2 +-
drivers/media/video/cx88/Makefile | 2 +-
drivers/media/video/em28xx/Makefile | 2 +-
drivers/media/video/ivtv/Makefile | 2 +-
drivers/media/video/pvrusb2/Makefile | 2 +-
drivers/media/video/saa7134/Makefile | 2 +-
drivers/media/video/saa7164/Makefile | 2 +-
drivers/media/video/tlg2300/Makefile | 2 +-
drivers/media/video/tm6000/Makefile | 2 +-
drivers/staging/media/as102/Makefile | 2 +-
drivers/staging/media/cxd2099/Makefile | 2 +-
drivers/staging/media/go7007/Makefile | 2 +-
60 files changed, 67 insertions(+), 64 deletions(-)
create mode 100644 drivers/media/dvb-core/Kconfig
rename drivers/media/{dvb => }/dvb-core/Makefile (100%)
rename drivers/media/{dvb => }/dvb-core/demux.h (100%)
rename drivers/media/{dvb => }/dvb-core/dmxdev.c (100%)
rename drivers/media/{dvb => }/dvb-core/dmxdev.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_demux.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_demux.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_filter.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_filter.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_frontend.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_frontend.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_math.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_math.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_net.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_net.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h (100%)
rename drivers/media/{dvb => }/dvb-core/dvbdev.c (100%)
rename drivers/media/{dvb => }/dvb-core/dvbdev.h (100%)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 8bb3b66..e9159de 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -163,6 +163,7 @@ source "drivers/media/radio/Kconfig"
# DVB adapters
#
+source "drivers/media/dvb-core/Kconfig"
source "drivers/media/dvb/Kconfig"
endif # MEDIA_SUPPORT
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 2f9abaa..7f9f99a 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -11,4 +11,4 @@ endif
obj-y += v4l2-core/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
-obj-$(CONFIG_DVB_CORE) += dvb/
+obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile
index 891b80e..2ddbb2c 100644
--- a/drivers/media/common/tuners/Makefile
+++ b/drivers/media/common/tuners/Makefile
@@ -33,5 +33,5 @@ obj-$(CONFIG_MEDIA_TUNER_FC0011) += fc0011.o
obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o
obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o
-ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
diff --git a/drivers/media/dvb-core/Kconfig b/drivers/media/dvb-core/Kconfig
new file mode 100644
index 0000000..fa7a249
--- /dev/null
+++ b/drivers/media/dvb-core/Kconfig
@@ -0,0 +1,29 @@
+#
+# DVB device configuration
+#
+
+config DVB_MAX_ADAPTERS
+ int "maximum number of DVB/ATSC adapters"
+ depends on DVB_CORE
+ default 8
+ range 1 255
+ help
+ Maximum number of DVB/ATSC adapters. Increasing this number
+ increases the memory consumption of the DVB subsystem even
+ if a much lower number of DVB/ATSC adapters is present.
+ Only values in the range 4-32 are tested.
+
+ If you are unsure about this, use the default value 8
+
+config DVB_DYNAMIC_MINORS
+ bool "Dynamic DVB minor allocation"
+ depends on DVB_CORE
+ default n
+ help
+ If you say Y here, the DVB subsystem will use dynamic minor
+ allocation for any device that uses the DVB major number.
+ This means that you can have more than 4 of a single type
+ of device (like demuxes and frontends) per adapter, but udev
+ will be required to manage the device nodes.
+
+ If you are unsure about this, say N here.
diff --git a/drivers/media/dvb/dvb-core/Makefile b/drivers/media/dvb-core/Makefile
similarity index 100%
rename from drivers/media/dvb/dvb-core/Makefile
rename to drivers/media/dvb-core/Makefile
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb-core/demux.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/demux.h
rename to drivers/media/dvb-core/demux.h
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dmxdev.c
rename to drivers/media/dvb-core/dmxdev.c
diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb-core/dmxdev.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dmxdev.h
rename to drivers/media/dvb-core/dmxdev.h
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_ca_en50221.c
rename to drivers/media/dvb-core/dvb_ca_en50221.c
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h b/drivers/media/dvb-core/dvb_ca_en50221.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_ca_en50221.h
rename to drivers/media/dvb-core/dvb_ca_en50221.h
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_demux.c
rename to drivers/media/dvb-core/dvb_demux.c
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb-core/dvb_demux.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_demux.h
rename to drivers/media/dvb-core/dvb_demux.h
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.c b/drivers/media/dvb-core/dvb_filter.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_filter.c
rename to drivers/media/dvb-core/dvb_filter.c
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.h b/drivers/media/dvb-core/dvb_filter.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_filter.h
rename to drivers/media/dvb-core/dvb_filter.h
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_frontend.c
rename to drivers/media/dvb-core/dvb_frontend.c
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_frontend.h
rename to drivers/media/dvb-core/dvb_frontend.h
diff --git a/drivers/media/dvb/dvb-core/dvb_math.c b/drivers/media/dvb-core/dvb_math.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_math.c
rename to drivers/media/dvb-core/dvb_math.c
diff --git a/drivers/media/dvb/dvb-core/dvb_math.h b/drivers/media/dvb-core/dvb_math.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_math.h
rename to drivers/media/dvb-core/dvb_math.h
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_net.c
rename to drivers/media/dvb-core/dvb_net.c
diff --git a/drivers/media/dvb/dvb-core/dvb_net.h b/drivers/media/dvb-core/dvb_net.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_net.h
rename to drivers/media/dvb-core/dvb_net.h
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb-core/dvb_ringbuffer.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_ringbuffer.c
rename to drivers/media/dvb-core/dvb_ringbuffer.c
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h b/drivers/media/dvb-core/dvb_ringbuffer.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvb_ringbuffer.h
rename to drivers/media/dvb-core/dvb_ringbuffer.h
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvbdev.c
rename to drivers/media/dvb-core/dvbdev.c
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
similarity index 100%
rename from drivers/media/dvb/dvb-core/dvbdev.h
rename to drivers/media/dvb-core/dvbdev.h
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index f6e40b3..1b2ac47 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -2,32 +2,6 @@
# DVB device configuration
#
-config DVB_MAX_ADAPTERS
- int "maximum number of DVB/ATSC adapters"
- depends on DVB_CORE
- default 8
- range 1 255
- help
- Maximum number of DVB/ATSC adapters. Increasing this number
- increases the memory consumption of the DVB subsystem even
- if a much lower number of DVB/ATSC adapters is present.
- Only values in the range 4-32 are tested.
-
- If you are unsure about this, use the default value 8
-
-config DVB_DYNAMIC_MINORS
- bool "Dynamic DVB minor allocation"
- depends on DVB_CORE
- default n
- help
- If you say Y here, the DVB subsystem will use dynamic minor
- allocation for any device that uses the DVB major number.
- This means that you can have more than 4 of a single type
- of device (like demuxes and frontends) per adapter, but udev
- will be required to manage the device nodes.
-
- If you are unsure about this, say N here.
-
menuconfig DVB_CAPTURE_DRIVERS
bool "DVB/ATSC adapters"
depends on DVB_CORE
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index b2cefe6..4ac62b7 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,8 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-y := dvb-core/ \
- frontends/ \
+obj-y := frontends/ \
ttpci/ \
ttusb-dec/ \
ttusb-budget/ \
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile
index 3d04a8d..e4291e4 100644
--- a/drivers/media/dvb/b2c2/Makefile
+++ b/drivers/media/dvb/b2c2/Makefile
@@ -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/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index 0713b3a..7c2dd04 100644
--- a/drivers/media/dvb/bt8xx/Makefile
+++ b/drivers/media/dvb/bt8xx/Makefile
@@ -1,6 +1,6 @@
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/video/bt8xx
ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile
index 38019ba..9eca27d 100644
--- a/drivers/media/dvb/ddbridge/Makefile
+++ b/drivers/media/dvb/ddbridge/Makefile
@@ -6,7 +6,7 @@ ddbridge-objs := ddbridge-core.o
obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
-ccflags-y += -Idrivers/media/dvb/dvb-core/
+ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/dvb/dm1105/Makefile
index 95a008b..0dc5963 100644
--- a/drivers/media/dvb/dm1105/Makefile
+++ b/drivers/media/dvb/dm1105/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_DM1105) += dm1105.o
-ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index b667ac3..90deca2 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -113,7 +113,7 @@ obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
dvb-usb-af9035-objs = af9035.o
obj-$(CONFIG_DVB_USB_AF9035) += dvb-usb-af9035.o
-ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
# due to tuner-xc3028
ccflags-y += -I$(srctree)/drivers/media/common/tuners
diff --git a/drivers/media/dvb/firewire/Makefile b/drivers/media/dvb/firewire/Makefile
index 357b3aa..f314813 100644
--- a/drivers/media/dvb/firewire/Makefile
+++ b/drivers/media/dvb/firewire/Makefile
@@ -3,4 +3,4 @@ obj-$(CONFIG_DVB_FIREDTV) += firedtv.o
firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o
firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index cd1ac2f..28671c2 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -2,7 +2,7 @@
# Makefile for the kernel DVB frontend device drivers.
#
-ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core/
+ccflags-y += -I$(srctree)/drivers/media/dvb-core/
ccflags-y += -I$(srctree)/drivers/media/common/tuners/
stb0899-objs = stb0899_drv.o stb0899_algo.o
diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile
index ec8116d..3384119 100644
--- a/drivers/media/dvb/mantis/Makefile
+++ b/drivers/media/dvb/mantis/Makefile
@@ -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/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/dvb/ngene/Makefile
index 13ebeff..dae7659 100644
--- a/drivers/media/dvb/ngene/Makefile
+++ b/drivers/media/dvb/ngene/Makefile
@@ -6,7 +6,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/dvb-core/
+ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/media/dvb/pluto2/Makefile b/drivers/media/dvb/pluto2/Makefile
index 7008223..14fa578 100644
--- a/drivers/media/dvb/pluto2/Makefile
+++ b/drivers/media/dvb/pluto2/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
-ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/drivers/media/dvb/pt1/Makefile b/drivers/media/dvb/pt1/Makefile
index d80d8e8..c80492a 100644
--- a/drivers/media/dvb/pt1/Makefile
+++ b/drivers/media/dvb/pt1/Makefile
@@ -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/dvb-core -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/dvb/siano/Makefile
index f233b57..14756bd 100644
--- a/drivers/media/dvb/siano/Makefile
+++ b/drivers/media/dvb/siano/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
obj-$(CONFIG_SMS_USB_DRV) += smsusb.o
obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile
index f6e8693..b0ddb45 100644
--- a/drivers/media/dvb/ttpci/Makefile
+++ b/drivers/media/dvb/ttpci/Makefile
@@ -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/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/ttusb-budget/Makefile b/drivers/media/dvb/ttusb-budget/Makefile
index 8d6c4ac..c5abe78 100644
--- a/drivers/media/dvb/ttusb-budget/Makefile
+++ b/drivers/media/dvb/ttusb-budget/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
-ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/ttusb-dec/Makefile b/drivers/media/dvb/ttusb-dec/Makefile
index ed28b53..5352740 100644
--- a/drivers/media/dvb/ttusb-dec/Makefile
+++ b/drivers/media/dvb/ttusb-dec/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o
-ccflags-y += -Idrivers/media/dvb/dvb-core/
+ccflags-y += -Idrivers/media/dvb-core/
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index 7319c27..f5036d1 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
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/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 088d834..d8ffba9 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -185,6 +185,6 @@ obj-y += davinci/
obj-$(CONFIG_ARCH_OMAP) += omap/
-ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners
diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/video/au0828/Makefile
index bd22223..59d15b3 100644
--- a/drivers/media/video/au0828/Makefile
+++ b/drivers/media/video/au0828/Makefile
@@ -3,7 +3,7 @@ au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-vid
obj-$(CONFIG_VIDEO_AU0828) += au0828.o
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
index 3f9a2b2..4cba4ef 100644
--- a/drivers/media/video/bt8xx/Makefile
+++ b/drivers/media/video/bt8xx/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_VIDEO_BT848) += bttv.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile
index a86bab5..e0701e9 100644
--- a/drivers/media/video/cx18/Makefile
+++ b/drivers/media/video/cx18/Makefile
@@ -8,6 +8,6 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o
obj-$(CONFIG_VIDEO_CX18) += cx18.o
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
index b334897..fc72cad 100644
--- a/drivers/media/video/cx231xx/Makefile
+++ b/drivers/media/video/cx231xx/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb/dvb-usb
diff --git a/drivers/media/video/cx23885/Makefile b/drivers/media/video/cx23885/Makefile
index f81f279..3608f32 100644
--- a/drivers/media/video/cx23885/Makefile
+++ b/drivers/media/video/cx23885/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/cx25821/Makefile b/drivers/media/video/cx25821/Makefile
index aedde18..1628aa3 100644
--- a/drivers/media/video/cx25821/Makefile
+++ b/drivers/media/video/cx25821/Makefile
@@ -9,5 +9,5 @@ obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index c1a2785..1902366 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -12,5 +12,5 @@ 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/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
index c8b338d..b00298a 100644
--- a/drivers/media/video/em28xx/Makefile
+++ b/drivers/media/video/em28xx/Makefile
@@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile
index 77de8a4..c54cfe1 100644
--- a/drivers/media/video/ivtv/Makefile
+++ b/drivers/media/video/ivtv/Makefile
@@ -9,6 +9,6 @@ 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/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile
index c17f37d..298a930 100644
--- a/drivers/media/video/pvrusb2/Makefile
+++ b/drivers/media/video/pvrusb2/Makefile
@@ -18,5 +18,5 @@ obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index da38993..364891f 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -12,5 +12,5 @@ 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/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
diff --git a/drivers/media/video/saa7164/Makefile b/drivers/media/video/saa7164/Makefile
index 068443a..50e19f9 100644
--- a/drivers/media/video/saa7164/Makefile
+++ b/drivers/media/video/saa7164/Makefile
@@ -6,7 +6,7 @@ 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/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/tlg2300/Makefile b/drivers/media/video/tlg2300/Makefile
index ea09b9a..f0f4f6a 100644
--- a/drivers/media/video/tlg2300/Makefile
+++ b/drivers/media/video/tlg2300/Makefile
@@ -4,6 +4,6 @@ obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/video/tm6000/Makefile b/drivers/media/video/tm6000/Makefile
index 395515b..b797a8a 100644
--- a/drivers/media/video/tm6000/Makefile
+++ b/drivers/media/video/tm6000/Makefile
@@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
diff --git a/drivers/staging/media/as102/Makefile b/drivers/staging/media/as102/Makefile
index 1bca43e..d8dfb75 100644
--- a/drivers/staging/media/as102/Makefile
+++ b/drivers/staging/media/as102/Makefile
@@ -3,4 +3,4 @@ dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
obj-$(CONFIG_DVB_AS102) += dvb-as102.o
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb-core
diff --git a/drivers/staging/media/cxd2099/Makefile b/drivers/staging/media/cxd2099/Makefile
index 64cfc77..b0833fa 100644
--- a/drivers/staging/media/cxd2099/Makefile
+++ b/drivers/staging/media/cxd2099/Makefile
@@ -1,5 +1,5 @@
obj-$(CONFIG_DVB_CXD2099) += cxd2099.o
-ccflags-y += -Idrivers/media/dvb/dvb-core/
+ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index 6ee837c..eea1e72 100644
--- a/drivers/staging/media/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
@@ -27,4 +27,4 @@ s2250-y := s2250-board.o
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/dvb-core
+ccflags-y += -Idrivers/media/dvb-core
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 03/10] [media] move the dvb/frontends to drivers/media/dvb-frontends
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 01/10] [media] v4l: move v4l2 core into a separate directory Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 02/10] [media] dvb: move the dvb core one level up Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 04/10] [media] firewire: move it one level up Mauro Carvalho Chehab
` (7 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
Raise the DVB frontends one level up, as the intention is to remove
the drivers/media/dvb directory.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/Kconfig | 4 ++++
drivers/media/Makefile | 2 +-
drivers/media/common/tuners/Makefile | 2 +-
drivers/media/{dvb/frontends => dvb-frontends}/Kconfig | 0
drivers/media/{dvb/frontends => dvb-frontends}/Makefile | 0
drivers/media/{dvb/frontends => dvb-frontends}/a8293.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/a8293.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/af9013.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/af9013.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/af9033.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/af9033.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/au8522.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxd.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxk.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/ec100.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/ec100.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/ec100_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/l64781.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/l64781.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/mt312.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/mt312.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/mt352.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/mt352.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/or51132.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/or51132.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/or51211.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/or51211.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/s921.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/s921.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c | 0
drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h | 0
drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h | 0
drivers/media/dvb/Kconfig | 4 ----
drivers/media/dvb/Makefile | 3 +--
drivers/media/dvb/b2c2/Makefile | 2 +-
drivers/media/dvb/bt8xx/Makefile | 2 +-
drivers/media/dvb/ddbridge/Makefile | 2 +-
drivers/media/dvb/dm1105/Makefile | 2 +-
drivers/media/dvb/dvb-usb/Makefile | 2 +-
drivers/media/dvb/mantis/Makefile | 2 +-
drivers/media/dvb/ngene/Makefile | 2 +-
drivers/media/dvb/pluto2/Makefile | 2 +-
drivers/media/dvb/pt1/Makefile | 2 +-
drivers/media/dvb/ttpci/Makefile | 2 +-
drivers/media/dvb/ttusb-budget/Makefile | 2 +-
drivers/media/v4l2-core/Makefile | 2 +-
drivers/media/video/Makefile | 2 +-
drivers/media/video/au0828/Makefile | 2 +-
drivers/media/video/cx18/Makefile | 2 +-
drivers/media/video/cx231xx/Makefile | 2 +-
drivers/media/video/cx23885/Makefile | 2 +-
drivers/media/video/cx25821/Makefile | 2 +-
drivers/media/video/cx88/Makefile | 2 +-
drivers/media/video/em28xx/Makefile | 2 +-
drivers/media/video/ivtv/Makefile | 2 +-
drivers/media/video/pvrusb2/Makefile | 2 +-
drivers/media/video/saa7134/Makefile | 2 +-
drivers/media/video/saa7164/Makefile | 2 +-
drivers/media/video/tlg2300/Makefile | 2 +-
drivers/media/video/tm6000/Makefile | 2 +-
drivers/staging/media/cxd2099/Makefile | 2 +-
drivers/staging/media/go7007/Makefile | 2 +-
268 files changed, 35 insertions(+), 36 deletions(-)
rename drivers/media/{dvb/frontends => dvb-frontends}/Kconfig (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/Makefile (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ec100_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s921.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/s921.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h (100%)
rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h (100%)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index e9159de..318c2bf 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -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
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 7f9f99a..f95b9e3 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -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/
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile
index 2ddbb2c..112aeee 100644
--- a/drivers/media/common/tuners/Makefile
+++ b/drivers/media/common/tuners/Makefile
@@ -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
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
similarity index 100%
rename from drivers/media/dvb/frontends/Kconfig
rename to drivers/media/dvb-frontends/Kconfig
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb-frontends/Makefile
similarity index 100%
rename from drivers/media/dvb/frontends/Makefile
rename to drivers/media/dvb-frontends/Makefile
diff --git a/drivers/media/dvb/frontends/a8293.c b/drivers/media/dvb-frontends/a8293.c
similarity index 100%
rename from drivers/media/dvb/frontends/a8293.c
rename to drivers/media/dvb-frontends/a8293.c
diff --git a/drivers/media/dvb/frontends/a8293.h b/drivers/media/dvb-frontends/a8293.h
similarity index 100%
rename from drivers/media/dvb/frontends/a8293.h
rename to drivers/media/dvb-frontends/a8293.h
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
similarity index 100%
rename from drivers/media/dvb/frontends/af9013.c
rename to drivers/media/dvb-frontends/af9013.c
diff --git a/drivers/media/dvb/frontends/af9013.h b/drivers/media/dvb-frontends/af9013.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9013.h
rename to drivers/media/dvb-frontends/af9013.h
diff --git a/drivers/media/dvb/frontends/af9013_priv.h b/drivers/media/dvb-frontends/af9013_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9013_priv.h
rename to drivers/media/dvb-frontends/af9013_priv.h
diff --git a/drivers/media/dvb/frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
similarity index 100%
rename from drivers/media/dvb/frontends/af9033.c
rename to drivers/media/dvb-frontends/af9033.c
diff --git a/drivers/media/dvb/frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9033.h
rename to drivers/media/dvb-frontends/af9033.h
diff --git a/drivers/media/dvb/frontends/af9033_priv.h b/drivers/media/dvb-frontends/af9033_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/af9033_priv.h
rename to drivers/media/dvb-frontends/af9033_priv.h
diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb-frontends/atbm8830.c
similarity index 100%
rename from drivers/media/dvb/frontends/atbm8830.c
rename to drivers/media/dvb-frontends/atbm8830.c
diff --git a/drivers/media/dvb/frontends/atbm8830.h b/drivers/media/dvb-frontends/atbm8830.h
similarity index 100%
rename from drivers/media/dvb/frontends/atbm8830.h
rename to drivers/media/dvb-frontends/atbm8830.h
diff --git a/drivers/media/dvb/frontends/atbm8830_priv.h b/drivers/media/dvb-frontends/atbm8830_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/atbm8830_priv.h
rename to drivers/media/dvb-frontends/atbm8830_priv.h
diff --git a/drivers/media/dvb/frontends/au8522.h b/drivers/media/dvb-frontends/au8522.h
similarity index 100%
rename from drivers/media/dvb/frontends/au8522.h
rename to drivers/media/dvb-frontends/au8522.h
diff --git a/drivers/media/dvb/frontends/au8522_common.c b/drivers/media/dvb-frontends/au8522_common.c
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_common.c
rename to drivers/media/dvb-frontends/au8522_common.c
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb-frontends/au8522_decoder.c
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_decoder.c
rename to drivers/media/dvb-frontends/au8522_decoder.c
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_dig.c
rename to drivers/media/dvb-frontends/au8522_dig.c
diff --git a/drivers/media/dvb/frontends/au8522_priv.h b/drivers/media/dvb-frontends/au8522_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/au8522_priv.h
rename to drivers/media/dvb-frontends/au8522_priv.h
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
similarity index 100%
rename from drivers/media/dvb/frontends/bcm3510.c
rename to drivers/media/dvb-frontends/bcm3510.c
diff --git a/drivers/media/dvb/frontends/bcm3510.h b/drivers/media/dvb-frontends/bcm3510.h
similarity index 100%
rename from drivers/media/dvb/frontends/bcm3510.h
rename to drivers/media/dvb-frontends/bcm3510.h
diff --git a/drivers/media/dvb/frontends/bcm3510_priv.h b/drivers/media/dvb-frontends/bcm3510_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/bcm3510_priv.h
rename to drivers/media/dvb-frontends/bcm3510_priv.h
diff --git a/drivers/media/dvb/frontends/bsbe1-d01a.h b/drivers/media/dvb-frontends/bsbe1-d01a.h
similarity index 100%
rename from drivers/media/dvb/frontends/bsbe1-d01a.h
rename to drivers/media/dvb-frontends/bsbe1-d01a.h
diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb-frontends/bsbe1.h
similarity index 100%
rename from drivers/media/dvb/frontends/bsbe1.h
rename to drivers/media/dvb-frontends/bsbe1.h
diff --git a/drivers/media/dvb/frontends/bsru6.h b/drivers/media/dvb-frontends/bsru6.h
similarity index 100%
rename from drivers/media/dvb/frontends/bsru6.h
rename to drivers/media/dvb-frontends/bsru6.h
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx22700.c
rename to drivers/media/dvb-frontends/cx22700.c
diff --git a/drivers/media/dvb/frontends/cx22700.h b/drivers/media/dvb-frontends/cx22700.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx22700.h
rename to drivers/media/dvb-frontends/cx22700.h
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb-frontends/cx22702.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx22702.c
rename to drivers/media/dvb-frontends/cx22702.c
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb-frontends/cx22702.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx22702.h
rename to drivers/media/dvb-frontends/cx22702.h
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24110.c
rename to drivers/media/dvb-frontends/cx24110.c
diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb-frontends/cx24110.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24110.h
rename to drivers/media/dvb-frontends/cx24110.h
diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb-frontends/cx24113.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24113.c
rename to drivers/media/dvb-frontends/cx24113.c
diff --git a/drivers/media/dvb/frontends/cx24113.h b/drivers/media/dvb-frontends/cx24113.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24113.h
rename to drivers/media/dvb-frontends/cx24113.h
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24116.c
rename to drivers/media/dvb-frontends/cx24116.c
diff --git a/drivers/media/dvb/frontends/cx24116.h b/drivers/media/dvb-frontends/cx24116.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24116.h
rename to drivers/media/dvb-frontends/cx24116.h
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
similarity index 100%
rename from drivers/media/dvb/frontends/cx24123.c
rename to drivers/media/dvb-frontends/cx24123.c
diff --git a/drivers/media/dvb/frontends/cx24123.h b/drivers/media/dvb-frontends/cx24123.h
similarity index 100%
rename from drivers/media/dvb/frontends/cx24123.h
rename to drivers/media/dvb-frontends/cx24123.h
diff --git a/drivers/media/dvb/frontends/cxd2820r.h b/drivers/media/dvb-frontends/cxd2820r.h
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r.h
rename to drivers/media/dvb-frontends/cxd2820r.h
diff --git a/drivers/media/dvb/frontends/cxd2820r_c.c b/drivers/media/dvb-frontends/cxd2820r_c.c
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_c.c
rename to drivers/media/dvb-frontends/cxd2820r_c.c
diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_core.c
rename to drivers/media/dvb-frontends/cxd2820r_core.c
diff --git a/drivers/media/dvb/frontends/cxd2820r_priv.h b/drivers/media/dvb-frontends/cxd2820r_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_priv.h
rename to drivers/media/dvb-frontends/cxd2820r_priv.h
diff --git a/drivers/media/dvb/frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_t.c
rename to drivers/media/dvb-frontends/cxd2820r_t.c
diff --git a/drivers/media/dvb/frontends/cxd2820r_t2.c b/drivers/media/dvb-frontends/cxd2820r_t2.c
similarity index 100%
rename from drivers/media/dvb/frontends/cxd2820r_t2.c
rename to drivers/media/dvb-frontends/cxd2820r_t2.c
diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb-frontends/dib0070.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib0070.c
rename to drivers/media/dvb-frontends/dib0070.c
diff --git a/drivers/media/dvb/frontends/dib0070.h b/drivers/media/dvb-frontends/dib0070.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib0070.h
rename to drivers/media/dvb-frontends/dib0070.h
diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb-frontends/dib0090.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib0090.c
rename to drivers/media/dvb-frontends/dib0090.c
diff --git a/drivers/media/dvb/frontends/dib0090.h b/drivers/media/dvb-frontends/dib0090.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib0090.h
rename to drivers/media/dvb-frontends/dib0090.h
diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000.h
rename to drivers/media/dvb-frontends/dib3000.h
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mb.c
rename to drivers/media/dvb-frontends/dib3000mb.c
diff --git a/drivers/media/dvb/frontends/dib3000mb_priv.h b/drivers/media/dvb-frontends/dib3000mb_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mb_priv.h
rename to drivers/media/dvb-frontends/dib3000mb_priv.h
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb-frontends/dib3000mc.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mc.c
rename to drivers/media/dvb-frontends/dib3000mc.c
diff --git a/drivers/media/dvb/frontends/dib3000mc.h b/drivers/media/dvb-frontends/dib3000mc.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib3000mc.h
rename to drivers/media/dvb-frontends/dib3000mc.h
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb-frontends/dib7000m.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000m.c
rename to drivers/media/dvb-frontends/dib7000m.c
diff --git a/drivers/media/dvb/frontends/dib7000m.h b/drivers/media/dvb-frontends/dib7000m.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000m.h
rename to drivers/media/dvb-frontends/dib7000m.h
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000p.c
rename to drivers/media/dvb-frontends/dib7000p.c
diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib7000p.h
rename to drivers/media/dvb-frontends/dib7000p.h
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib8000.c
rename to drivers/media/dvb-frontends/dib8000.c
diff --git a/drivers/media/dvb/frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib8000.h
rename to drivers/media/dvb-frontends/dib8000.h
diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb-frontends/dib9000.c
similarity index 100%
rename from drivers/media/dvb/frontends/dib9000.c
rename to drivers/media/dvb-frontends/dib9000.c
diff --git a/drivers/media/dvb/frontends/dib9000.h b/drivers/media/dvb-frontends/dib9000.h
similarity index 100%
rename from drivers/media/dvb/frontends/dib9000.h
rename to drivers/media/dvb-frontends/dib9000.h
diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb-frontends/dibx000_common.c
similarity index 100%
rename from drivers/media/dvb/frontends/dibx000_common.c
rename to drivers/media/dvb-frontends/dibx000_common.c
diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb-frontends/dibx000_common.h
similarity index 100%
rename from drivers/media/dvb/frontends/dibx000_common.h
rename to drivers/media/dvb-frontends/dibx000_common.h
diff --git a/drivers/media/dvb/frontends/drxd.h b/drivers/media/dvb-frontends/drxd.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxd.h
rename to drivers/media/dvb-frontends/drxd.h
diff --git a/drivers/media/dvb/frontends/drxd_firm.c b/drivers/media/dvb-frontends/drxd_firm.c
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_firm.c
rename to drivers/media/dvb-frontends/drxd_firm.c
diff --git a/drivers/media/dvb/frontends/drxd_firm.h b/drivers/media/dvb-frontends/drxd_firm.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_firm.h
rename to drivers/media/dvb-frontends/drxd_firm.h
diff --git a/drivers/media/dvb/frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_hard.c
rename to drivers/media/dvb-frontends/drxd_hard.c
diff --git a/drivers/media/dvb/frontends/drxd_map_firm.h b/drivers/media/dvb-frontends/drxd_map_firm.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxd_map_firm.h
rename to drivers/media/dvb-frontends/drxd_map_firm.h
diff --git a/drivers/media/dvb/frontends/drxk.h b/drivers/media/dvb-frontends/drxk.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxk.h
rename to drivers/media/dvb-frontends/drxk.h
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
similarity index 100%
rename from drivers/media/dvb/frontends/drxk_hard.c
rename to drivers/media/dvb-frontends/drxk_hard.c
diff --git a/drivers/media/dvb/frontends/drxk_hard.h b/drivers/media/dvb-frontends/drxk_hard.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxk_hard.h
rename to drivers/media/dvb-frontends/drxk_hard.h
diff --git a/drivers/media/dvb/frontends/drxk_map.h b/drivers/media/dvb-frontends/drxk_map.h
similarity index 100%
rename from drivers/media/dvb/frontends/drxk_map.h
rename to drivers/media/dvb-frontends/drxk_map.h
diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
similarity index 100%
rename from drivers/media/dvb/frontends/ds3000.c
rename to drivers/media/dvb-frontends/ds3000.c
diff --git a/drivers/media/dvb/frontends/ds3000.h b/drivers/media/dvb-frontends/ds3000.h
similarity index 100%
rename from drivers/media/dvb/frontends/ds3000.h
rename to drivers/media/dvb-frontends/ds3000.h
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb-frontends/dvb-pll.c
similarity index 100%
rename from drivers/media/dvb/frontends/dvb-pll.c
rename to drivers/media/dvb-frontends/dvb-pll.c
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb-frontends/dvb-pll.h
similarity index 100%
rename from drivers/media/dvb/frontends/dvb-pll.h
rename to drivers/media/dvb-frontends/dvb-pll.h
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
similarity index 100%
rename from drivers/media/dvb/frontends/dvb_dummy_fe.c
rename to drivers/media/dvb-frontends/dvb_dummy_fe.c
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.h b/drivers/media/dvb-frontends/dvb_dummy_fe.h
similarity index 100%
rename from drivers/media/dvb/frontends/dvb_dummy_fe.h
rename to drivers/media/dvb-frontends/dvb_dummy_fe.h
diff --git a/drivers/media/dvb/frontends/ec100.c b/drivers/media/dvb-frontends/ec100.c
similarity index 100%
rename from drivers/media/dvb/frontends/ec100.c
rename to drivers/media/dvb-frontends/ec100.c
diff --git a/drivers/media/dvb/frontends/ec100.h b/drivers/media/dvb-frontends/ec100.h
similarity index 100%
rename from drivers/media/dvb/frontends/ec100.h
rename to drivers/media/dvb-frontends/ec100.h
diff --git a/drivers/media/dvb/frontends/ec100_priv.h b/drivers/media/dvb-frontends/ec100_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/ec100_priv.h
rename to drivers/media/dvb-frontends/ec100_priv.h
diff --git a/drivers/media/dvb/frontends/eds1547.h b/drivers/media/dvb-frontends/eds1547.h
similarity index 100%
rename from drivers/media/dvb/frontends/eds1547.h
rename to drivers/media/dvb-frontends/eds1547.h
diff --git a/drivers/media/dvb/frontends/hd29l2.c b/drivers/media/dvb-frontends/hd29l2.c
similarity index 100%
rename from drivers/media/dvb/frontends/hd29l2.c
rename to drivers/media/dvb-frontends/hd29l2.c
diff --git a/drivers/media/dvb/frontends/hd29l2.h b/drivers/media/dvb-frontends/hd29l2.h
similarity index 100%
rename from drivers/media/dvb/frontends/hd29l2.h
rename to drivers/media/dvb-frontends/hd29l2.h
diff --git a/drivers/media/dvb/frontends/hd29l2_priv.h b/drivers/media/dvb-frontends/hd29l2_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/hd29l2_priv.h
rename to drivers/media/dvb-frontends/hd29l2_priv.h
diff --git a/drivers/media/dvb/frontends/isl6405.c b/drivers/media/dvb-frontends/isl6405.c
similarity index 100%
rename from drivers/media/dvb/frontends/isl6405.c
rename to drivers/media/dvb-frontends/isl6405.c
diff --git a/drivers/media/dvb/frontends/isl6405.h b/drivers/media/dvb-frontends/isl6405.h
similarity index 100%
rename from drivers/media/dvb/frontends/isl6405.h
rename to drivers/media/dvb-frontends/isl6405.h
diff --git a/drivers/media/dvb/frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c
similarity index 100%
rename from drivers/media/dvb/frontends/isl6421.c
rename to drivers/media/dvb-frontends/isl6421.c
diff --git a/drivers/media/dvb/frontends/isl6421.h b/drivers/media/dvb-frontends/isl6421.h
similarity index 100%
rename from drivers/media/dvb/frontends/isl6421.h
rename to drivers/media/dvb-frontends/isl6421.h
diff --git a/drivers/media/dvb/frontends/isl6423.c b/drivers/media/dvb-frontends/isl6423.c
similarity index 100%
rename from drivers/media/dvb/frontends/isl6423.c
rename to drivers/media/dvb-frontends/isl6423.c
diff --git a/drivers/media/dvb/frontends/isl6423.h b/drivers/media/dvb-frontends/isl6423.h
similarity index 100%
rename from drivers/media/dvb/frontends/isl6423.h
rename to drivers/media/dvb-frontends/isl6423.h
diff --git a/drivers/media/dvb/frontends/it913x-fe-priv.h b/drivers/media/dvb-frontends/it913x-fe-priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/it913x-fe-priv.h
rename to drivers/media/dvb-frontends/it913x-fe-priv.h
diff --git a/drivers/media/dvb/frontends/it913x-fe.c b/drivers/media/dvb-frontends/it913x-fe.c
similarity index 100%
rename from drivers/media/dvb/frontends/it913x-fe.c
rename to drivers/media/dvb-frontends/it913x-fe.c
diff --git a/drivers/media/dvb/frontends/it913x-fe.h b/drivers/media/dvb-frontends/it913x-fe.h
similarity index 100%
rename from drivers/media/dvb/frontends/it913x-fe.h
rename to drivers/media/dvb-frontends/it913x-fe.h
diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb-frontends/itd1000.c
similarity index 100%
rename from drivers/media/dvb/frontends/itd1000.c
rename to drivers/media/dvb-frontends/itd1000.c
diff --git a/drivers/media/dvb/frontends/itd1000.h b/drivers/media/dvb-frontends/itd1000.h
similarity index 100%
rename from drivers/media/dvb/frontends/itd1000.h
rename to drivers/media/dvb-frontends/itd1000.h
diff --git a/drivers/media/dvb/frontends/itd1000_priv.h b/drivers/media/dvb-frontends/itd1000_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/itd1000_priv.h
rename to drivers/media/dvb-frontends/itd1000_priv.h
diff --git a/drivers/media/dvb/frontends/ix2505v.c b/drivers/media/dvb-frontends/ix2505v.c
similarity index 100%
rename from drivers/media/dvb/frontends/ix2505v.c
rename to drivers/media/dvb-frontends/ix2505v.c
diff --git a/drivers/media/dvb/frontends/ix2505v.h b/drivers/media/dvb-frontends/ix2505v.h
similarity index 100%
rename from drivers/media/dvb/frontends/ix2505v.h
rename to drivers/media/dvb-frontends/ix2505v.h
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb-frontends/l64781.c
similarity index 100%
rename from drivers/media/dvb/frontends/l64781.c
rename to drivers/media/dvb-frontends/l64781.c
diff --git a/drivers/media/dvb/frontends/l64781.h b/drivers/media/dvb-frontends/l64781.h
similarity index 100%
rename from drivers/media/dvb/frontends/l64781.h
rename to drivers/media/dvb-frontends/l64781.h
diff --git a/drivers/media/dvb/frontends/lg2160.c b/drivers/media/dvb-frontends/lg2160.c
similarity index 100%
rename from drivers/media/dvb/frontends/lg2160.c
rename to drivers/media/dvb-frontends/lg2160.c
diff --git a/drivers/media/dvb/frontends/lg2160.h b/drivers/media/dvb-frontends/lg2160.h
similarity index 100%
rename from drivers/media/dvb/frontends/lg2160.h
rename to drivers/media/dvb-frontends/lg2160.h
diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb-frontends/lgdt3305.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt3305.c
rename to drivers/media/dvb-frontends/lgdt3305.c
diff --git a/drivers/media/dvb/frontends/lgdt3305.h b/drivers/media/dvb-frontends/lgdt3305.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt3305.h
rename to drivers/media/dvb-frontends/lgdt3305.h
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt330x.c
rename to drivers/media/dvb-frontends/lgdt330x.c
diff --git a/drivers/media/dvb/frontends/lgdt330x.h b/drivers/media/dvb-frontends/lgdt330x.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt330x.h
rename to drivers/media/dvb-frontends/lgdt330x.h
diff --git a/drivers/media/dvb/frontends/lgdt330x_priv.h b/drivers/media/dvb-frontends/lgdt330x_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgdt330x_priv.h
rename to drivers/media/dvb-frontends/lgdt330x_priv.h
diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb-frontends/lgs8gl5.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gl5.c
rename to drivers/media/dvb-frontends/lgs8gl5.c
diff --git a/drivers/media/dvb/frontends/lgs8gl5.h b/drivers/media/dvb-frontends/lgs8gl5.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gl5.h
rename to drivers/media/dvb-frontends/lgs8gl5.h
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb-frontends/lgs8gxx.c
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gxx.c
rename to drivers/media/dvb-frontends/lgs8gxx.c
diff --git a/drivers/media/dvb/frontends/lgs8gxx.h b/drivers/media/dvb-frontends/lgs8gxx.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gxx.h
rename to drivers/media/dvb-frontends/lgs8gxx.h
diff --git a/drivers/media/dvb/frontends/lgs8gxx_priv.h b/drivers/media/dvb-frontends/lgs8gxx_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/lgs8gxx_priv.h
rename to drivers/media/dvb-frontends/lgs8gxx_priv.h
diff --git a/drivers/media/dvb/frontends/lnbh24.h b/drivers/media/dvb-frontends/lnbh24.h
similarity index 100%
rename from drivers/media/dvb/frontends/lnbh24.h
rename to drivers/media/dvb-frontends/lnbh24.h
diff --git a/drivers/media/dvb/frontends/lnbp21.c b/drivers/media/dvb-frontends/lnbp21.c
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp21.c
rename to drivers/media/dvb-frontends/lnbp21.c
diff --git a/drivers/media/dvb/frontends/lnbp21.h b/drivers/media/dvb-frontends/lnbp21.h
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp21.h
rename to drivers/media/dvb-frontends/lnbp21.h
diff --git a/drivers/media/dvb/frontends/lnbp22.c b/drivers/media/dvb-frontends/lnbp22.c
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp22.c
rename to drivers/media/dvb-frontends/lnbp22.c
diff --git a/drivers/media/dvb/frontends/lnbp22.h b/drivers/media/dvb-frontends/lnbp22.h
similarity index 100%
rename from drivers/media/dvb/frontends/lnbp22.h
rename to drivers/media/dvb-frontends/lnbp22.h
diff --git a/drivers/media/dvb/frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c
similarity index 100%
rename from drivers/media/dvb/frontends/m88rs2000.c
rename to drivers/media/dvb-frontends/m88rs2000.c
diff --git a/drivers/media/dvb/frontends/m88rs2000.h b/drivers/media/dvb-frontends/m88rs2000.h
similarity index 100%
rename from drivers/media/dvb/frontends/m88rs2000.h
rename to drivers/media/dvb-frontends/m88rs2000.h
diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb-frontends/mb86a16.c
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a16.c
rename to drivers/media/dvb-frontends/mb86a16.c
diff --git a/drivers/media/dvb/frontends/mb86a16.h b/drivers/media/dvb-frontends/mb86a16.h
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a16.h
rename to drivers/media/dvb-frontends/mb86a16.h
diff --git a/drivers/media/dvb/frontends/mb86a16_priv.h b/drivers/media/dvb-frontends/mb86a16_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a16_priv.h
rename to drivers/media/dvb-frontends/mb86a16_priv.h
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a20s.c
rename to drivers/media/dvb-frontends/mb86a20s.c
diff --git a/drivers/media/dvb/frontends/mb86a20s.h b/drivers/media/dvb-frontends/mb86a20s.h
similarity index 100%
rename from drivers/media/dvb/frontends/mb86a20s.h
rename to drivers/media/dvb-frontends/mb86a20s.h
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
similarity index 100%
rename from drivers/media/dvb/frontends/mt312.c
rename to drivers/media/dvb-frontends/mt312.c
diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb-frontends/mt312.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt312.h
rename to drivers/media/dvb-frontends/mt312.h
diff --git a/drivers/media/dvb/frontends/mt312_priv.h b/drivers/media/dvb-frontends/mt312_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt312_priv.h
rename to drivers/media/dvb-frontends/mt312_priv.h
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb-frontends/mt352.c
similarity index 100%
rename from drivers/media/dvb/frontends/mt352.c
rename to drivers/media/dvb-frontends/mt352.c
diff --git a/drivers/media/dvb/frontends/mt352.h b/drivers/media/dvb-frontends/mt352.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt352.h
rename to drivers/media/dvb-frontends/mt352.h
diff --git a/drivers/media/dvb/frontends/mt352_priv.h b/drivers/media/dvb-frontends/mt352_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/mt352_priv.h
rename to drivers/media/dvb-frontends/mt352_priv.h
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
similarity index 100%
rename from drivers/media/dvb/frontends/nxt200x.c
rename to drivers/media/dvb-frontends/nxt200x.c
diff --git a/drivers/media/dvb/frontends/nxt200x.h b/drivers/media/dvb-frontends/nxt200x.h
similarity index 100%
rename from drivers/media/dvb/frontends/nxt200x.h
rename to drivers/media/dvb-frontends/nxt200x.h
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb-frontends/nxt6000.c
similarity index 100%
rename from drivers/media/dvb/frontends/nxt6000.c
rename to drivers/media/dvb-frontends/nxt6000.c
diff --git a/drivers/media/dvb/frontends/nxt6000.h b/drivers/media/dvb-frontends/nxt6000.h
similarity index 100%
rename from drivers/media/dvb/frontends/nxt6000.h
rename to drivers/media/dvb-frontends/nxt6000.h
diff --git a/drivers/media/dvb/frontends/nxt6000_priv.h b/drivers/media/dvb-frontends/nxt6000_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/nxt6000_priv.h
rename to drivers/media/dvb-frontends/nxt6000_priv.h
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
similarity index 100%
rename from drivers/media/dvb/frontends/or51132.c
rename to drivers/media/dvb-frontends/or51132.c
diff --git a/drivers/media/dvb/frontends/or51132.h b/drivers/media/dvb-frontends/or51132.h
similarity index 100%
rename from drivers/media/dvb/frontends/or51132.h
rename to drivers/media/dvb-frontends/or51132.h
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb-frontends/or51211.c
similarity index 100%
rename from drivers/media/dvb/frontends/or51211.c
rename to drivers/media/dvb-frontends/or51211.c
diff --git a/drivers/media/dvb/frontends/or51211.h b/drivers/media/dvb-frontends/or51211.h
similarity index 100%
rename from drivers/media/dvb/frontends/or51211.h
rename to drivers/media/dvb-frontends/or51211.h
diff --git a/drivers/media/dvb/frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
similarity index 100%
rename from drivers/media/dvb/frontends/rtl2830.c
rename to drivers/media/dvb-frontends/rtl2830.c
diff --git a/drivers/media/dvb/frontends/rtl2830.h b/drivers/media/dvb-frontends/rtl2830.h
similarity index 100%
rename from drivers/media/dvb/frontends/rtl2830.h
rename to drivers/media/dvb-frontends/rtl2830.h
diff --git a/drivers/media/dvb/frontends/rtl2830_priv.h b/drivers/media/dvb-frontends/rtl2830_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/rtl2830_priv.h
rename to drivers/media/dvb-frontends/rtl2830_priv.h
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb-frontends/s5h1409.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1409.c
rename to drivers/media/dvb-frontends/s5h1409.c
diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb-frontends/s5h1409.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1409.h
rename to drivers/media/dvb-frontends/s5h1409.h
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb-frontends/s5h1411.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1411.c
rename to drivers/media/dvb-frontends/s5h1411.c
diff --git a/drivers/media/dvb/frontends/s5h1411.h b/drivers/media/dvb-frontends/s5h1411.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1411.h
rename to drivers/media/dvb-frontends/s5h1411.h
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb-frontends/s5h1420.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1420.c
rename to drivers/media/dvb-frontends/s5h1420.c
diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb-frontends/s5h1420.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1420.h
rename to drivers/media/dvb-frontends/s5h1420.h
diff --git a/drivers/media/dvb/frontends/s5h1420_priv.h b/drivers/media/dvb-frontends/s5h1420_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1420_priv.h
rename to drivers/media/dvb-frontends/s5h1420_priv.h
diff --git a/drivers/media/dvb/frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1432.c
rename to drivers/media/dvb-frontends/s5h1432.c
diff --git a/drivers/media/dvb/frontends/s5h1432.h b/drivers/media/dvb-frontends/s5h1432.h
similarity index 100%
rename from drivers/media/dvb/frontends/s5h1432.h
rename to drivers/media/dvb-frontends/s5h1432.h
diff --git a/drivers/media/dvb/frontends/s921.c b/drivers/media/dvb-frontends/s921.c
similarity index 100%
rename from drivers/media/dvb/frontends/s921.c
rename to drivers/media/dvb-frontends/s921.c
diff --git a/drivers/media/dvb/frontends/s921.h b/drivers/media/dvb-frontends/s921.h
similarity index 100%
rename from drivers/media/dvb/frontends/s921.h
rename to drivers/media/dvb-frontends/s921.h
diff --git a/drivers/media/dvb/frontends/si21xx.c b/drivers/media/dvb-frontends/si21xx.c
similarity index 100%
rename from drivers/media/dvb/frontends/si21xx.c
rename to drivers/media/dvb-frontends/si21xx.c
diff --git a/drivers/media/dvb/frontends/si21xx.h b/drivers/media/dvb-frontends/si21xx.h
similarity index 100%
rename from drivers/media/dvb/frontends/si21xx.h
rename to drivers/media/dvb-frontends/si21xx.h
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c
similarity index 100%
rename from drivers/media/dvb/frontends/sp8870.c
rename to drivers/media/dvb-frontends/sp8870.c
diff --git a/drivers/media/dvb/frontends/sp8870.h b/drivers/media/dvb-frontends/sp8870.h
similarity index 100%
rename from drivers/media/dvb/frontends/sp8870.h
rename to drivers/media/dvb-frontends/sp8870.h
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
similarity index 100%
rename from drivers/media/dvb/frontends/sp887x.c
rename to drivers/media/dvb-frontends/sp887x.c
diff --git a/drivers/media/dvb/frontends/sp887x.h b/drivers/media/dvb-frontends/sp887x.h
similarity index 100%
rename from drivers/media/dvb/frontends/sp887x.h
rename to drivers/media/dvb-frontends/sp887x.h
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb-frontends/stb0899_algo.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_algo.c
rename to drivers/media/dvb-frontends/stb0899_algo.c
diff --git a/drivers/media/dvb/frontends/stb0899_cfg.h b/drivers/media/dvb-frontends/stb0899_cfg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_cfg.h
rename to drivers/media/dvb-frontends/stb0899_cfg.h
diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_drv.c
rename to drivers/media/dvb-frontends/stb0899_drv.c
diff --git a/drivers/media/dvb/frontends/stb0899_drv.h b/drivers/media/dvb-frontends/stb0899_drv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_drv.h
rename to drivers/media/dvb-frontends/stb0899_drv.h
diff --git a/drivers/media/dvb/frontends/stb0899_priv.h b/drivers/media/dvb-frontends/stb0899_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_priv.h
rename to drivers/media/dvb-frontends/stb0899_priv.h
diff --git a/drivers/media/dvb/frontends/stb0899_reg.h b/drivers/media/dvb-frontends/stb0899_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb0899_reg.h
rename to drivers/media/dvb-frontends/stb0899_reg.h
diff --git a/drivers/media/dvb/frontends/stb6000.c b/drivers/media/dvb-frontends/stb6000.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb6000.c
rename to drivers/media/dvb-frontends/stb6000.c
diff --git a/drivers/media/dvb/frontends/stb6000.h b/drivers/media/dvb-frontends/stb6000.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6000.h
rename to drivers/media/dvb-frontends/stb6000.h
diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100.c
rename to drivers/media/dvb-frontends/stb6100.c
diff --git a/drivers/media/dvb/frontends/stb6100.h b/drivers/media/dvb-frontends/stb6100.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100.h
rename to drivers/media/dvb-frontends/stb6100.h
diff --git a/drivers/media/dvb/frontends/stb6100_cfg.h b/drivers/media/dvb-frontends/stb6100_cfg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100_cfg.h
rename to drivers/media/dvb-frontends/stb6100_cfg.h
diff --git a/drivers/media/dvb/frontends/stb6100_proc.h b/drivers/media/dvb-frontends/stb6100_proc.h
similarity index 100%
rename from drivers/media/dvb/frontends/stb6100_proc.h
rename to drivers/media/dvb-frontends/stb6100_proc.h
diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb-frontends/stv0288.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0288.c
rename to drivers/media/dvb-frontends/stv0288.c
diff --git a/drivers/media/dvb/frontends/stv0288.h b/drivers/media/dvb-frontends/stv0288.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0288.h
rename to drivers/media/dvb-frontends/stv0288.h
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb-frontends/stv0297.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0297.c
rename to drivers/media/dvb-frontends/stv0297.c
diff --git a/drivers/media/dvb/frontends/stv0297.h b/drivers/media/dvb-frontends/stv0297.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0297.h
rename to drivers/media/dvb-frontends/stv0297.h
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0299.c
rename to drivers/media/dvb-frontends/stv0299.c
diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb-frontends/stv0299.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0299.h
rename to drivers/media/dvb-frontends/stv0299.h
diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367.c
rename to drivers/media/dvb-frontends/stv0367.c
diff --git a/drivers/media/dvb/frontends/stv0367.h b/drivers/media/dvb-frontends/stv0367.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367.h
rename to drivers/media/dvb-frontends/stv0367.h
diff --git a/drivers/media/dvb/frontends/stv0367_priv.h b/drivers/media/dvb-frontends/stv0367_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367_priv.h
rename to drivers/media/dvb-frontends/stv0367_priv.h
diff --git a/drivers/media/dvb/frontends/stv0367_regs.h b/drivers/media/dvb-frontends/stv0367_regs.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0367_regs.h
rename to drivers/media/dvb-frontends/stv0367_regs.h
diff --git a/drivers/media/dvb/frontends/stv0900.h b/drivers/media/dvb-frontends/stv0900.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900.h
rename to drivers/media/dvb-frontends/stv0900.h
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb-frontends/stv0900_core.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_core.c
rename to drivers/media/dvb-frontends/stv0900_core.c
diff --git a/drivers/media/dvb/frontends/stv0900_init.h b/drivers/media/dvb-frontends/stv0900_init.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_init.h
rename to drivers/media/dvb-frontends/stv0900_init.h
diff --git a/drivers/media/dvb/frontends/stv0900_priv.h b/drivers/media/dvb-frontends/stv0900_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_priv.h
rename to drivers/media/dvb-frontends/stv0900_priv.h
diff --git a/drivers/media/dvb/frontends/stv0900_reg.h b/drivers/media/dvb-frontends/stv0900_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_reg.h
rename to drivers/media/dvb-frontends/stv0900_reg.h
diff --git a/drivers/media/dvb/frontends/stv0900_sw.c b/drivers/media/dvb-frontends/stv0900_sw.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv0900_sw.c
rename to drivers/media/dvb-frontends/stv0900_sw.c
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x.c
rename to drivers/media/dvb-frontends/stv090x.c
diff --git a/drivers/media/dvb/frontends/stv090x.h b/drivers/media/dvb-frontends/stv090x.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x.h
rename to drivers/media/dvb-frontends/stv090x.h
diff --git a/drivers/media/dvb/frontends/stv090x_priv.h b/drivers/media/dvb-frontends/stv090x_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x_priv.h
rename to drivers/media/dvb-frontends/stv090x_priv.h
diff --git a/drivers/media/dvb/frontends/stv090x_reg.h b/drivers/media/dvb-frontends/stv090x_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv090x_reg.h
rename to drivers/media/dvb-frontends/stv090x_reg.h
diff --git a/drivers/media/dvb/frontends/stv6110.c b/drivers/media/dvb-frontends/stv6110.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110.c
rename to drivers/media/dvb-frontends/stv6110.c
diff --git a/drivers/media/dvb/frontends/stv6110.h b/drivers/media/dvb-frontends/stv6110.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110.h
rename to drivers/media/dvb-frontends/stv6110.h
diff --git a/drivers/media/dvb/frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x.c
rename to drivers/media/dvb-frontends/stv6110x.c
diff --git a/drivers/media/dvb/frontends/stv6110x.h b/drivers/media/dvb-frontends/stv6110x.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x.h
rename to drivers/media/dvb-frontends/stv6110x.h
diff --git a/drivers/media/dvb/frontends/stv6110x_priv.h b/drivers/media/dvb-frontends/stv6110x_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x_priv.h
rename to drivers/media/dvb-frontends/stv6110x_priv.h
diff --git a/drivers/media/dvb/frontends/stv6110x_reg.h b/drivers/media/dvb-frontends/stv6110x_reg.h
similarity index 100%
rename from drivers/media/dvb/frontends/stv6110x_reg.h
rename to drivers/media/dvb-frontends/stv6110x_reg.h
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb-frontends/tda10021.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10021.c
rename to drivers/media/dvb-frontends/tda10021.c
diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb-frontends/tda10023.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10023.c
rename to drivers/media/dvb-frontends/tda10023.c
diff --git a/drivers/media/dvb/frontends/tda1002x.h b/drivers/media/dvb-frontends/tda1002x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda1002x.h
rename to drivers/media/dvb-frontends/tda1002x.h
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10048.c
rename to drivers/media/dvb-frontends/tda10048.c
diff --git a/drivers/media/dvb/frontends/tda10048.h b/drivers/media/dvb-frontends/tda10048.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10048.h
rename to drivers/media/dvb-frontends/tda10048.h
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb-frontends/tda1004x.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda1004x.c
rename to drivers/media/dvb-frontends/tda1004x.c
diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb-frontends/tda1004x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda1004x.h
rename to drivers/media/dvb-frontends/tda1004x.h
diff --git a/drivers/media/dvb/frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10071.c
rename to drivers/media/dvb-frontends/tda10071.c
diff --git a/drivers/media/dvb/frontends/tda10071.h b/drivers/media/dvb-frontends/tda10071.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10071.h
rename to drivers/media/dvb-frontends/tda10071.h
diff --git a/drivers/media/dvb/frontends/tda10071_priv.h b/drivers/media/dvb-frontends/tda10071_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10071_priv.h
rename to drivers/media/dvb-frontends/tda10071_priv.h
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb-frontends/tda10086.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda10086.c
rename to drivers/media/dvb-frontends/tda10086.c
diff --git a/drivers/media/dvb/frontends/tda10086.h b/drivers/media/dvb-frontends/tda10086.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda10086.h
rename to drivers/media/dvb-frontends/tda10086.h
diff --git a/drivers/media/dvb/frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda18271c2dd.c
rename to drivers/media/dvb-frontends/tda18271c2dd.c
diff --git a/drivers/media/dvb/frontends/tda18271c2dd.h b/drivers/media/dvb-frontends/tda18271c2dd.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda18271c2dd.h
rename to drivers/media/dvb-frontends/tda18271c2dd.h
diff --git a/drivers/media/dvb/frontends/tda18271c2dd_maps.h b/drivers/media/dvb-frontends/tda18271c2dd_maps.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda18271c2dd_maps.h
rename to drivers/media/dvb-frontends/tda18271c2dd_maps.h
diff --git a/drivers/media/dvb/frontends/tda665x.c b/drivers/media/dvb-frontends/tda665x.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda665x.c
rename to drivers/media/dvb-frontends/tda665x.c
diff --git a/drivers/media/dvb/frontends/tda665x.h b/drivers/media/dvb-frontends/tda665x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda665x.h
rename to drivers/media/dvb-frontends/tda665x.h
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda8083.c
rename to drivers/media/dvb-frontends/tda8083.c
diff --git a/drivers/media/dvb/frontends/tda8083.h b/drivers/media/dvb-frontends/tda8083.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda8083.h
rename to drivers/media/dvb-frontends/tda8083.h
diff --git a/drivers/media/dvb/frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda8261.c
rename to drivers/media/dvb-frontends/tda8261.c
diff --git a/drivers/media/dvb/frontends/tda8261.h b/drivers/media/dvb-frontends/tda8261.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda8261.h
rename to drivers/media/dvb-frontends/tda8261.h
diff --git a/drivers/media/dvb/frontends/tda8261_cfg.h b/drivers/media/dvb-frontends/tda8261_cfg.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda8261_cfg.h
rename to drivers/media/dvb-frontends/tda8261_cfg.h
diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb-frontends/tda826x.c
similarity index 100%
rename from drivers/media/dvb/frontends/tda826x.c
rename to drivers/media/dvb-frontends/tda826x.c
diff --git a/drivers/media/dvb/frontends/tda826x.h b/drivers/media/dvb-frontends/tda826x.h
similarity index 100%
rename from drivers/media/dvb/frontends/tda826x.h
rename to drivers/media/dvb-frontends/tda826x.h
diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb-frontends/tdhd1.h
similarity index 100%
rename from drivers/media/dvb/frontends/tdhd1.h
rename to drivers/media/dvb-frontends/tdhd1.h
diff --git a/drivers/media/dvb/frontends/tua6100.c b/drivers/media/dvb-frontends/tua6100.c
similarity index 100%
rename from drivers/media/dvb/frontends/tua6100.c
rename to drivers/media/dvb-frontends/tua6100.c
diff --git a/drivers/media/dvb/frontends/tua6100.h b/drivers/media/dvb-frontends/tua6100.h
similarity index 100%
rename from drivers/media/dvb/frontends/tua6100.h
rename to drivers/media/dvb-frontends/tua6100.h
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb-frontends/ves1820.c
similarity index 100%
rename from drivers/media/dvb/frontends/ves1820.c
rename to drivers/media/dvb-frontends/ves1820.c
diff --git a/drivers/media/dvb/frontends/ves1820.h b/drivers/media/dvb-frontends/ves1820.h
similarity index 100%
rename from drivers/media/dvb/frontends/ves1820.h
rename to drivers/media/dvb-frontends/ves1820.h
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb-frontends/ves1x93.c
similarity index 100%
rename from drivers/media/dvb/frontends/ves1x93.c
rename to drivers/media/dvb-frontends/ves1x93.c
diff --git a/drivers/media/dvb/frontends/ves1x93.h b/drivers/media/dvb-frontends/ves1x93.h
similarity index 100%
rename from drivers/media/dvb/frontends/ves1x93.h
rename to drivers/media/dvb-frontends/ves1x93.h
diff --git a/drivers/media/dvb/frontends/z0194a.h b/drivers/media/dvb-frontends/z0194a.h
similarity index 100%
rename from drivers/media/dvb/frontends/z0194a.h
rename to drivers/media/dvb-frontends/z0194a.h
diff --git a/drivers/media/dvb/frontends/zl10036.c b/drivers/media/dvb-frontends/zl10036.c
similarity index 100%
rename from drivers/media/dvb/frontends/zl10036.c
rename to drivers/media/dvb-frontends/zl10036.c
diff --git a/drivers/media/dvb/frontends/zl10036.h b/drivers/media/dvb-frontends/zl10036.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10036.h
rename to drivers/media/dvb-frontends/zl10036.h
diff --git a/drivers/media/dvb/frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c
similarity index 100%
rename from drivers/media/dvb/frontends/zl10039.c
rename to drivers/media/dvb-frontends/zl10039.c
diff --git a/drivers/media/dvb/frontends/zl10039.h b/drivers/media/dvb-frontends/zl10039.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10039.h
rename to drivers/media/dvb-frontends/zl10039.h
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb-frontends/zl10353.c
similarity index 100%
rename from drivers/media/dvb/frontends/zl10353.c
rename to drivers/media/dvb-frontends/zl10353.c
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb-frontends/zl10353.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10353.h
rename to drivers/media/dvb-frontends/zl10353.h
diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb-frontends/zl10353_priv.h
similarity index 100%
rename from drivers/media/dvb/frontends/zl10353_priv.h
rename to drivers/media/dvb-frontends/zl10353_priv.h
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 1b2ac47..874ff53 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -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
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index 4ac62b7..352adaa 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -2,8 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-y := frontends/ \
- ttpci/ \
+obj-y := ttpci/ \
ttusb-dec/ \
ttusb-budget/ \
b2c2/ \
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile
index e4291e4..7a1f5ce 100644
--- a/drivers/media/dvb/b2c2/Makefile
+++ b/drivers/media/dvb/b2c2/Makefile
@@ -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/
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index 7c2dd04..36591ae 100644
--- a/drivers/media/dvb/bt8xx/Makefile
+++ b/drivers/media/dvb/bt8xx/Makefile
@@ -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
diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile
index 9eca27d..9d083c9 100644
--- a/drivers/media/dvb/ddbridge/Makefile
+++ b/drivers/media/dvb/ddbridge/Makefile
@@ -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
diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/dvb/dm1105/Makefile
index 0dc5963..3275851 100644
--- a/drivers/media/dvb/dm1105/Makefile
+++ b/drivers/media/dvb/dm1105/Makefile
@@ -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
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 90deca2..23de51d 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -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
diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile
index 3384119..f715051 100644
--- a/drivers/media/dvb/mantis/Makefile
+++ b/drivers/media/dvb/mantis/Makefile
@@ -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/
diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/dvb/ngene/Makefile
index dae7659..6399708 100644
--- a/drivers/media/dvb/ngene/Makefile
+++ b/drivers/media/dvb/ngene/Makefile
@@ -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
diff --git a/drivers/media/dvb/pluto2/Makefile b/drivers/media/dvb/pluto2/Makefile
index 14fa578..524bf84 100644
--- a/drivers/media/dvb/pluto2/Makefile
+++ b/drivers/media/dvb/pluto2/Makefile
@@ -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/
diff --git a/drivers/media/dvb/pt1/Makefile b/drivers/media/dvb/pt1/Makefile
index c80492a..98e3912 100644
--- a/drivers/media/dvb/pt1/Makefile
+++ b/drivers/media/dvb/pt1/Makefile
@@ -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
diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile
index b0ddb45..22a235f 100644
--- a/drivers/media/dvb/ttpci/Makefile
+++ b/drivers/media/dvb/ttpci/Makefile
@@ -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
diff --git a/drivers/media/dvb/ttusb-budget/Makefile b/drivers/media/dvb/ttusb-budget/Makefile
index c5abe78..f47bbf6 100644
--- a/drivers/media/dvb/ttusb-budget/Makefile
+++ b/drivers/media/dvb/ttusb-budget/Makefile
@@ -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
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index f5036d1..74b65ea 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -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
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index d8ffba9..17d729d 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -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
diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/video/au0828/Makefile
index 59d15b3..61b69e6 100644
--- a/drivers/media/video/au0828/Makefile
+++ b/drivers/media/video/au0828/Makefile
@@ -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)
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile
index e0701e9..db5ab12 100644
--- a/drivers/media/video/cx18/Makefile
+++ b/drivers/media/video/cx18/Makefile
@@ -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
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
index fc72cad..2697325 100644
--- a/drivers/media/video/cx231xx/Makefile
+++ b/drivers/media/video/cx231xx/Makefile
@@ -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
diff --git a/drivers/media/video/cx23885/Makefile b/drivers/media/video/cx23885/Makefile
index 3608f32..8f82e01 100644
--- a/drivers/media/video/cx23885/Makefile
+++ b/drivers/media/video/cx23885/Makefile
@@ -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)
diff --git a/drivers/media/video/cx25821/Makefile b/drivers/media/video/cx25821/Makefile
index 1628aa3..af23e0c 100644
--- a/drivers/media/video/cx25821/Makefile
+++ b/drivers/media/video/cx25821/Makefile
@@ -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
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index 1902366..5c4d306 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -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
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
index b00298a..f4118d2 100644
--- a/drivers/media/video/em28xx/Makefile
+++ b/drivers/media/video/em28xx/Makefile
@@ -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
diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile
index c54cfe1..0015bd4 100644
--- a/drivers/media/video/ivtv/Makefile
+++ b/drivers/media/video/ivtv/Makefile
@@ -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
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile
index 298a930..1458797 100644
--- a/drivers/media/video/pvrusb2/Makefile
+++ b/drivers/media/video/pvrusb2/Makefile
@@ -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
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 364891f..7af78a8 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -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
diff --git a/drivers/media/video/saa7164/Makefile b/drivers/media/video/saa7164/Makefile
index 50e19f9..d8ed33d 100644
--- a/drivers/media/video/saa7164/Makefile
+++ b/drivers/media/video/saa7164/Makefile
@@ -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)
diff --git a/drivers/media/video/tlg2300/Makefile b/drivers/media/video/tlg2300/Makefile
index f0f4f6a..268d825 100644
--- a/drivers/media/video/tlg2300/Makefile
+++ b/drivers/media/video/tlg2300/Makefile
@@ -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
diff --git a/drivers/media/video/tm6000/Makefile b/drivers/media/video/tm6000/Makefile
index b797a8a..56cbcba 100644
--- a/drivers/media/video/tm6000/Makefile
+++ b/drivers/media/video/tm6000/Makefile
@@ -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
diff --git a/drivers/staging/media/cxd2099/Makefile b/drivers/staging/media/cxd2099/Makefile
index b0833fa..eb6bc59 100644
--- a/drivers/staging/media/cxd2099/Makefile
+++ b/drivers/staging/media/cxd2099/Makefile
@@ -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/
diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index eea1e72..f654ddc 100644
--- a/drivers/staging/media/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
@@ -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
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 04/10] [media] firewire: move it one level up
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (2 preceding siblings ...)
2012-06-14 20:35 ` [PATCH RFC 03/10] [media] move the dvb/frontends to drivers/media/dvb-frontends Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 05/10] [media] dvb-usb: move it to drivers/media/usb/dvb-usb Mauro Carvalho Chehab
` (6 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
Move firewire to one level up, as the dvb subdirectory will be
removed.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/Kconfig | 6 +++++-
drivers/media/Makefile | 1 +
drivers/media/dvb/Kconfig | 4 ----
drivers/media/dvb/Makefile | 2 --
drivers/media/{dvb => }/firewire/Kconfig | 0
drivers/media/{dvb => }/firewire/Makefile | 0
drivers/media/{dvb => }/firewire/firedtv-avc.c | 0
drivers/media/{dvb => }/firewire/firedtv-ci.c | 0
drivers/media/{dvb => }/firewire/firedtv-dvb.c | 0
drivers/media/{dvb => }/firewire/firedtv-fe.c | 0
drivers/media/{dvb => }/firewire/firedtv-fw.c | 0
drivers/media/{dvb => }/firewire/firedtv-rc.c | 0
drivers/media/{dvb => }/firewire/firedtv.h | 0
13 files changed, 6 insertions(+), 7 deletions(-)
rename drivers/media/{dvb => }/firewire/Kconfig (100%)
rename drivers/media/{dvb => }/firewire/Makefile (100%)
rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 318c2bf..788be30 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -166,8 +166,12 @@ source "drivers/media/radio/Kconfig"
source "drivers/media/dvb-core/Kconfig"
source "drivers/media/dvb/Kconfig"
+comment "Supported FireWire (IEEE 1394) Adapters"
+ depends on DVB_CORE && FIREWIRE
+source "drivers/media/firewire/Kconfig"
+
comment "Supported DVB Frontends"
- depends on DVB_CORE
+ depends on DVB_CORE
source "drivers/media/dvb-frontends/Kconfig"
endif # MEDIA_SUPPORT
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index f95b9e3..37e448c 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -12,3 +12,4 @@ obj-y += v4l2-core/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/
+obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 874ff53..71bb941 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -38,10 +38,6 @@ comment "Supported SDMC DM1105 Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/dm1105/Kconfig"
-comment "Supported FireWire (IEEE 1394) Adapters"
- depends on DVB_CORE && FIREWIRE
-source "drivers/media/dvb/firewire/Kconfig"
-
comment "Supported Earthsoft PT1 Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/pt1/Kconfig"
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index 352adaa..dd2864b 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -15,5 +15,3 @@ obj-y := ttpci/ \
mantis/ \
ngene/ \
ddbridge/
-
-obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/drivers/media/dvb/firewire/Kconfig b/drivers/media/firewire/Kconfig
similarity index 100%
rename from drivers/media/dvb/firewire/Kconfig
rename to drivers/media/firewire/Kconfig
diff --git a/drivers/media/dvb/firewire/Makefile b/drivers/media/firewire/Makefile
similarity index 100%
rename from drivers/media/dvb/firewire/Makefile
rename to drivers/media/firewire/Makefile
diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/firewire/firedtv-avc.c
similarity index 100%
rename from drivers/media/dvb/firewire/firedtv-avc.c
rename to drivers/media/firewire/firedtv-avc.c
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/firewire/firedtv-ci.c
similarity index 100%
rename from drivers/media/dvb/firewire/firedtv-ci.c
rename to drivers/media/firewire/firedtv-ci.c
diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/firewire/firedtv-dvb.c
similarity index 100%
rename from drivers/media/dvb/firewire/firedtv-dvb.c
rename to drivers/media/firewire/firedtv-dvb.c
diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/firewire/firedtv-fe.c
similarity index 100%
rename from drivers/media/dvb/firewire/firedtv-fe.c
rename to drivers/media/firewire/firedtv-fe.c
diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
similarity index 100%
rename from drivers/media/dvb/firewire/firedtv-fw.c
rename to drivers/media/firewire/firedtv-fw.c
diff --git a/drivers/media/dvb/firewire/firedtv-rc.c b/drivers/media/firewire/firedtv-rc.c
similarity index 100%
rename from drivers/media/dvb/firewire/firedtv-rc.c
rename to drivers/media/firewire/firedtv-rc.c
diff --git a/drivers/media/dvb/firewire/firedtv.h b/drivers/media/firewire/firedtv.h
similarity index 100%
rename from drivers/media/dvb/firewire/firedtv.h
rename to drivers/media/firewire/firedtv.h
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 05/10] [media] dvb-usb: move it to drivers/media/usb/dvb-usb
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (3 preceding siblings ...)
2012-06-14 20:35 ` [PATCH RFC 04/10] [media] firewire: move it one level up Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 06/10] [media] Rename media/dvb as media/pci Mauro Carvalho Chehab
` (5 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
As media/dvb will be removed, move it to a proper place.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
Documentation/dvb/README.dvb-usb | 2 +-
drivers/media/Kconfig | 1 +
drivers/media/Makefile | 2 +-
drivers/media/dvb/Kconfig | 7 -------
drivers/media/dvb/Makefile | 4 ----
drivers/media/usb/Kconfig | 17 +++++++++++++++++
drivers/media/usb/Makefile | 6 ++++++
drivers/media/{dvb => usb}/dvb-usb/Kconfig | 0
drivers/media/{dvb => usb}/dvb-usb/Makefile | 0
drivers/media/{dvb => usb}/dvb-usb/a800.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005-script.h | 0
drivers/media/{dvb => usb}/dvb-usb/af9005.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9005.h | 0
drivers/media/{dvb => usb}/dvb-usb/af9015.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9015.h | 0
drivers/media/{dvb => usb}/dvb-usb/af9035.c | 0
drivers/media/{dvb => usb}/dvb-usb/af9035.h | 0
drivers/media/{dvb => usb}/dvb-usb/anysee.c | 0
drivers/media/{dvb => usb}/dvb-usb/anysee.h | 0
drivers/media/{dvb => usb}/dvb-usb/au6610.c | 0
drivers/media/{dvb => usb}/dvb-usb/au6610.h | 0
drivers/media/{dvb => usb}/dvb-usb/az6007.c | 0
drivers/media/{dvb => usb}/dvb-usb/az6027.c | 0
drivers/media/{dvb => usb}/dvb-usb/az6027.h | 0
drivers/media/{dvb => usb}/dvb-usb/ce6230.c | 0
drivers/media/{dvb => usb}/dvb-usb/ce6230.h | 0
drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c | 0
drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h | 0
drivers/media/{dvb => usb}/dvb-usb/cxusb.c | 0
drivers/media/{dvb => usb}/dvb-usb/cxusb.h | 0
drivers/media/{dvb => usb}/dvb-usb/dib0700.h | 0
drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c | 0
drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c | 0
drivers/media/{dvb => usb}/dvb-usb/dib07x0.h | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c | 0
drivers/media/{dvb => usb}/dvb-usb/dibusb.h | 0
drivers/media/{dvb => usb}/dvb-usb/digitv.c | 0
drivers/media/{dvb => usb}/dvb-usb/digitv.h | 0
drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/dtt200u.c | 0
drivers/media/{dvb => usb}/dvb-usb/dtt200u.h | 0
drivers/media/{dvb => usb}/dvb-usb/dtv5100.c | 0
drivers/media/{dvb => usb}/dvb-usb/dtv5100.h | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-ids.h | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c | 0
drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h | 0
drivers/media/{dvb => usb}/dvb-usb/dw2102.c | 0
drivers/media/{dvb => usb}/dvb-usb/dw2102.h | 0
drivers/media/{dvb => usb}/dvb-usb/ec168.c | 0
drivers/media/{dvb => usb}/dvb-usb/ec168.h | 0
drivers/media/{dvb => usb}/dvb-usb/friio-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/friio.c | 0
drivers/media/{dvb => usb}/dvb-usb/friio.h | 0
drivers/media/{dvb => usb}/dvb-usb/gl861.c | 0
drivers/media/{dvb => usb}/dvb-usb/gl861.h | 0
drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/gp8psk.c | 0
drivers/media/{dvb => usb}/dvb-usb/gp8psk.h | 0
drivers/media/{dvb => usb}/dvb-usb/it913x.c | 0
drivers/media/{dvb => usb}/dvb-usb/lmedm04.c | 0
drivers/media/{dvb => usb}/dvb-usb/lmedm04.h | 0
drivers/media/{dvb => usb}/dvb-usb/m920x.c | 0
drivers/media/{dvb => usb}/dvb-usb/m920x.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-demod.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-demod.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-reg.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-tuner.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf-tuner.h | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf.c | 0
drivers/media/{dvb => usb}/dvb-usb/mxl111sf.h | 0
drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c | 0
drivers/media/{dvb => usb}/dvb-usb/opera1.c | 0
drivers/media/{dvb => usb}/dvb-usb/pctv452e.c | 0
drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.c | 0
drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.h | 0
drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c | 0
drivers/media/{dvb => usb}/dvb-usb/ttusb2.c | 0
drivers/media/{dvb => usb}/dvb-usb/ttusb2.h | 0
drivers/media/{dvb => usb}/dvb-usb/umt-010.c | 0
drivers/media/{dvb => usb}/dvb-usb/usb-urb.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp702x.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp702x.h | 0
drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp7045.c | 0
drivers/media/{dvb => usb}/dvb-usb/vp7045.h | 0
drivers/media/{dvb => usb}/siano/Kconfig | 0
drivers/media/{dvb => usb}/siano/Makefile | 0
drivers/media/{dvb => usb}/siano/sms-cards.c | 0
drivers/media/{dvb => usb}/siano/sms-cards.h | 0
drivers/media/{dvb => usb}/siano/smscoreapi.c | 0
drivers/media/{dvb => usb}/siano/smscoreapi.h | 0
drivers/media/{dvb => usb}/siano/smsdvb.c | 0
drivers/media/{dvb => usb}/siano/smsendian.c | 0
drivers/media/{dvb => usb}/siano/smsendian.h | 0
drivers/media/{dvb => usb}/siano/smsir.c | 0
drivers/media/{dvb => usb}/siano/smsir.h | 0
drivers/media/{dvb => usb}/siano/smssdio.c | 0
drivers/media/{dvb => usb}/siano/smsusb.c | 0
drivers/media/{dvb => usb}/ttusb-budget/Kconfig | 0
drivers/media/{dvb => usb}/ttusb-budget/Makefile | 0
.../{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c | 0
drivers/media/{dvb => usb}/ttusb-dec/Kconfig | 0
drivers/media/{dvb => usb}/ttusb-dec/Makefile | 0
drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c | 0
drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c | 0
drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h | 0
drivers/media/video/cx231xx/Makefile | 2 +-
drivers/staging/media/go7007/Makefile | 2 +-
126 files changed, 28 insertions(+), 15 deletions(-)
create mode 100644 drivers/media/usb/Kconfig
create mode 100644 drivers/media/usb/Makefile
rename drivers/media/{dvb => usb}/dvb-usb/Kconfig (100%)
rename drivers/media/{dvb => usb}/dvb-usb/Makefile (100%)
rename drivers/media/{dvb => usb}/dvb-usb/a800.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005-script.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9005.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9015.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9015.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9035.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/af9035.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/anysee.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/anysee.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/au6610.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/au6610.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/az6007.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/az6027.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/az6027.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ce6230.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ce6230.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cxusb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/cxusb.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib0700.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dib07x0.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dibusb.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/digitv.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/digitv.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-ids.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dw2102.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/dw2102.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ec168.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ec168.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/friio-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/friio.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/friio.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gl861.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gl861.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/it913x.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/lmedm04.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/lmedm04.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/m920x.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/m920x.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-demod.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-demod.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-gpio.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-i2c.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-phy.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-reg.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-tuner.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf-tuner.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/mxl111sf.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/opera1.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/pctv452e.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/rtl28xxu.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/umt-010.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/usb-urb.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp702x.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp702x.h (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp7045.c (100%)
rename drivers/media/{dvb => usb}/dvb-usb/vp7045.h (100%)
rename drivers/media/{dvb => usb}/siano/Kconfig (100%)
rename drivers/media/{dvb => usb}/siano/Makefile (100%)
rename drivers/media/{dvb => usb}/siano/sms-cards.c (100%)
rename drivers/media/{dvb => usb}/siano/sms-cards.h (100%)
rename drivers/media/{dvb => usb}/siano/smscoreapi.c (100%)
rename drivers/media/{dvb => usb}/siano/smscoreapi.h (100%)
rename drivers/media/{dvb => usb}/siano/smsdvb.c (100%)
rename drivers/media/{dvb => usb}/siano/smsendian.c (100%)
rename drivers/media/{dvb => usb}/siano/smsendian.h (100%)
rename drivers/media/{dvb => usb}/siano/smsir.c (100%)
rename drivers/media/{dvb => usb}/siano/smsir.h (100%)
rename drivers/media/{dvb => usb}/siano/smssdio.c (100%)
rename drivers/media/{dvb => usb}/siano/smsusb.c (100%)
rename drivers/media/{dvb => usb}/ttusb-budget/Kconfig (100%)
rename drivers/media/{dvb => usb}/ttusb-budget/Makefile (100%)
rename drivers/media/{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/Kconfig (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/Makefile (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c (100%)
rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h (100%)
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb
index c4d963a..8eb9226 100644
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
@@ -30,7 +30,7 @@ with the device via the bus. The connection between the DVB-API-functionality
is done via callbacks, assigned in a static device-description (struct
dvb_usb_device) each device-driver has to have.
-For an example have a look in drivers/media/dvb/dvb-usb/vp7045*.
+For an example have a look in drivers/media/usb/dvb-usb/vp7045*.
Objective is to migrate all the usb-devices (dibusb, cinergyT2, maybe the
ttusb; flexcop-usb already benefits from the generic flexcop-device) to use
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 788be30..d71a855 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -165,6 +165,7 @@ source "drivers/media/radio/Kconfig"
source "drivers/media/dvb-core/Kconfig"
source "drivers/media/dvb/Kconfig"
+source "drivers/media/usb/Kconfig"
comment "Supported FireWire (IEEE 1394) Adapters"
depends on DVB_CORE && FIREWIRE
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 37e448c..46a8dc3 100644
--- a/drivers/media/Makefile
+++ b/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/
+obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/ usb/
obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index 71bb941..e2565a4 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -15,13 +15,6 @@ comment "Supported SAA7146 based PCI Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/ttpci/Kconfig"
-comment "Supported USB Adapters"
- depends on DVB_CORE && USB && I2C
-source "drivers/media/dvb/dvb-usb/Kconfig"
-source "drivers/media/dvb/ttusb-budget/Kconfig"
-source "drivers/media/dvb/ttusb-dec/Kconfig"
-source "drivers/media/dvb/siano/Kconfig"
-
comment "Supported FlexCopII (B2C2) Adapters"
depends on DVB_CORE && (PCI || USB) && I2C
source "drivers/media/dvb/b2c2/Kconfig"
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index dd2864b..c5fa43a 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -3,13 +3,9 @@
#
obj-y := ttpci/ \
- ttusb-dec/ \
- ttusb-budget/ \
b2c2/ \
bt8xx/ \
- dvb-usb/ \
pluto2/ \
- siano/ \
dm1105/ \
pt1/ \
mantis/ \
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
new file mode 100644
index 0000000..d8891ad
--- /dev/null
+++ b/drivers/media/usb/Kconfig
@@ -0,0 +1,17 @@
+#
+# USB media device configuration
+#
+
+menuconfig MEDIA_USB_DRIVERS
+ bool "Supported DVB USB Adapters"
+ depends on USB
+ default y
+
+if MEDIA_USB_DRIVERS && DVB_CORE && I2C
+
+source "drivers/media/usb/dvb-usb/Kconfig"
+source "drivers/media/usb/ttusb-budget/Kconfig"
+source "drivers/media/usb/ttusb-dec/Kconfig"
+source "drivers/media/usb/siano/Kconfig"
+
+endif
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
new file mode 100644
index 0000000..b6c2229
--- /dev/null
+++ b/drivers/media/usb/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the USB media device drivers
+#
+
+# DVB USB-only drivers
+obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ siano/
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig
similarity index 100%
rename from drivers/media/dvb/dvb-usb/Kconfig
rename to drivers/media/usb/dvb-usb/Kconfig
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile
similarity index 100%
rename from drivers/media/dvb/dvb-usb/Makefile
rename to drivers/media/usb/dvb-usb/Makefile
diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/usb/dvb-usb/a800.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/a800.c
rename to drivers/media/usb/dvb-usb/a800.c
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/usb/dvb-usb/af9005-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005-fe.c
rename to drivers/media/usb/dvb-usb/af9005-fe.c
diff --git a/drivers/media/dvb/dvb-usb/af9005-remote.c b/drivers/media/usb/dvb-usb/af9005-remote.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005-remote.c
rename to drivers/media/usb/dvb-usb/af9005-remote.c
diff --git a/drivers/media/dvb/dvb-usb/af9005-script.h b/drivers/media/usb/dvb-usb/af9005-script.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005-script.h
rename to drivers/media/usb/dvb-usb/af9005-script.h
diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005.c
rename to drivers/media/usb/dvb-usb/af9005.c
diff --git a/drivers/media/dvb/dvb-usb/af9005.h b/drivers/media/usb/dvb-usb/af9005.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005.h
rename to drivers/media/usb/dvb-usb/af9005.h
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/usb/dvb-usb/af9015.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9015.c
rename to drivers/media/usb/dvb-usb/af9015.c
diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/usb/dvb-usb/af9015.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9015.h
rename to drivers/media/usb/dvb-usb/af9015.h
diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/usb/dvb-usb/af9035.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9035.c
rename to drivers/media/usb/dvb-usb/af9035.c
diff --git a/drivers/media/dvb/dvb-usb/af9035.h b/drivers/media/usb/dvb-usb/af9035.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9035.h
rename to drivers/media/usb/dvb-usb/af9035.h
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/usb/dvb-usb/anysee.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/anysee.c
rename to drivers/media/usb/dvb-usb/anysee.c
diff --git a/drivers/media/dvb/dvb-usb/anysee.h b/drivers/media/usb/dvb-usb/anysee.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/anysee.h
rename to drivers/media/usb/dvb-usb/anysee.h
diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/usb/dvb-usb/au6610.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/au6610.c
rename to drivers/media/usb/dvb-usb/au6610.c
diff --git a/drivers/media/dvb/dvb-usb/au6610.h b/drivers/media/usb/dvb-usb/au6610.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/au6610.h
rename to drivers/media/usb/dvb-usb/au6610.h
diff --git a/drivers/media/dvb/dvb-usb/az6007.c b/drivers/media/usb/dvb-usb/az6007.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/az6007.c
rename to drivers/media/usb/dvb-usb/az6007.c
diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/az6027.c
rename to drivers/media/usb/dvb-usb/az6027.c
diff --git a/drivers/media/dvb/dvb-usb/az6027.h b/drivers/media/usb/dvb-usb/az6027.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/az6027.h
rename to drivers/media/usb/dvb-usb/az6027.h
diff --git a/drivers/media/dvb/dvb-usb/ce6230.c b/drivers/media/usb/dvb-usb/ce6230.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ce6230.c
rename to drivers/media/usb/dvb-usb/ce6230.c
diff --git a/drivers/media/dvb/dvb-usb/ce6230.h b/drivers/media/usb/dvb-usb/ce6230.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ce6230.h
rename to drivers/media/usb/dvb-usb/ce6230.h
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cinergyT2-core.c
rename to drivers/media/usb/dvb-usb/cinergyT2-core.c
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cinergyT2-fe.c
rename to drivers/media/usb/dvb-usb/cinergyT2-fe.c
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2.h b/drivers/media/usb/dvb-usb/cinergyT2.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cinergyT2.h
rename to drivers/media/usb/dvb-usb/cinergyT2.h
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cxusb.c
rename to drivers/media/usb/dvb-usb/cxusb.c
diff --git a/drivers/media/dvb/dvb-usb/cxusb.h b/drivers/media/usb/dvb-usb/cxusb.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cxusb.h
rename to drivers/media/usb/dvb-usb/cxusb.h
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/usb/dvb-usb/dib0700.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib0700.h
rename to drivers/media/usb/dvb-usb/dib0700.h
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib0700_core.c
rename to drivers/media/usb/dvb-usb/dib0700_core.c
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib0700_devices.c
rename to drivers/media/usb/dvb-usb/dib0700_devices.c
diff --git a/drivers/media/dvb/dvb-usb/dib07x0.h b/drivers/media/usb/dvb-usb/dib07x0.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib07x0.h
rename to drivers/media/usb/dvb-usb/dib07x0.h
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb-common.c
rename to drivers/media/usb/dvb-usb/dibusb-common.c
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb-mb.c
rename to drivers/media/usb/dvb-usb/dibusb-mb.c
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb-mc.c
rename to drivers/media/usb/dvb-usb/dibusb-mc.c
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/usb/dvb-usb/dibusb.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb.h
rename to drivers/media/usb/dvb-usb/dibusb.h
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/digitv.c
rename to drivers/media/usb/dvb-usb/digitv.c
diff --git a/drivers/media/dvb/dvb-usb/digitv.h b/drivers/media/usb/dvb-usb/digitv.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/digitv.h
rename to drivers/media/usb/dvb-usb/digitv.h
diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/usb/dvb-usb/dtt200u-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtt200u-fe.c
rename to drivers/media/usb/dvb-usb/dtt200u-fe.c
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtt200u.c
rename to drivers/media/usb/dvb-usb/dtt200u.c
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.h b/drivers/media/usb/dvb-usb/dtt200u.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtt200u.h
rename to drivers/media/usb/dvb-usb/dtt200u.h
diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/usb/dvb-usb/dtv5100.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtv5100.c
rename to drivers/media/usb/dvb-usb/dtv5100.c
diff --git a/drivers/media/dvb/dvb-usb/dtv5100.h b/drivers/media/usb/dvb-usb/dtv5100.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtv5100.h
rename to drivers/media/usb/dvb-usb/dtv5100.h
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-common.h b/drivers/media/usb/dvb-usb/dvb-usb-common.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-common.h
rename to drivers/media/usb/dvb-usb/dvb-usb-common.h
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
rename to drivers/media/usb/dvb-usb/dvb-usb-dvb.c
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
rename to drivers/media/usb/dvb-usb/dvb-usb-firmware.c
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
rename to drivers/media/usb/dvb-usb/dvb-usb-i2c.c
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/usb/dvb-usb/dvb-usb-ids.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-ids.h
rename to drivers/media/usb/dvb-usb/dvb-usb-ids.h
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-init.c
rename to drivers/media/usb/dvb-usb/dvb-usb-init.c
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/usb/dvb-usb/dvb-usb-remote.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-remote.c
rename to drivers/media/usb/dvb-usb/dvb-usb-remote.c
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/usb/dvb-usb/dvb-usb-urb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-urb.c
rename to drivers/media/usb/dvb-usb/dvb-usb-urb.c
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb.h
rename to drivers/media/usb/dvb-usb/dvb-usb.h
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dw2102.c
rename to drivers/media/usb/dvb-usb/dw2102.c
diff --git a/drivers/media/dvb/dvb-usb/dw2102.h b/drivers/media/usb/dvb-usb/dw2102.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dw2102.h
rename to drivers/media/usb/dvb-usb/dw2102.h
diff --git a/drivers/media/dvb/dvb-usb/ec168.c b/drivers/media/usb/dvb-usb/ec168.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ec168.c
rename to drivers/media/usb/dvb-usb/ec168.c
diff --git a/drivers/media/dvb/dvb-usb/ec168.h b/drivers/media/usb/dvb-usb/ec168.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ec168.h
rename to drivers/media/usb/dvb-usb/ec168.h
diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/usb/dvb-usb/friio-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/friio-fe.c
rename to drivers/media/usb/dvb-usb/friio-fe.c
diff --git a/drivers/media/dvb/dvb-usb/friio.c b/drivers/media/usb/dvb-usb/friio.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/friio.c
rename to drivers/media/usb/dvb-usb/friio.c
diff --git a/drivers/media/dvb/dvb-usb/friio.h b/drivers/media/usb/dvb-usb/friio.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/friio.h
rename to drivers/media/usb/dvb-usb/friio.h
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/usb/dvb-usb/gl861.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gl861.c
rename to drivers/media/usb/dvb-usb/gl861.c
diff --git a/drivers/media/dvb/dvb-usb/gl861.h b/drivers/media/usb/dvb-usb/gl861.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gl861.h
rename to drivers/media/usb/dvb-usb/gl861.h
diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/usb/dvb-usb/gp8psk-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gp8psk-fe.c
rename to drivers/media/usb/dvb-usb/gp8psk-fe.c
diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gp8psk.c
rename to drivers/media/usb/dvb-usb/gp8psk.c
diff --git a/drivers/media/dvb/dvb-usb/gp8psk.h b/drivers/media/usb/dvb-usb/gp8psk.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gp8psk.h
rename to drivers/media/usb/dvb-usb/gp8psk.h
diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/usb/dvb-usb/it913x.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/it913x.c
rename to drivers/media/usb/dvb-usb/it913x.c
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/usb/dvb-usb/lmedm04.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/lmedm04.c
rename to drivers/media/usb/dvb-usb/lmedm04.c
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.h b/drivers/media/usb/dvb-usb/lmedm04.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/lmedm04.h
rename to drivers/media/usb/dvb-usb/lmedm04.h
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/usb/dvb-usb/m920x.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/m920x.c
rename to drivers/media/usb/dvb-usb/m920x.c
diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/usb/dvb-usb/m920x.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/m920x.h
rename to drivers/media/usb/dvb-usb/m920x.h
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/drivers/media/usb/dvb-usb/mxl111sf-demod.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-demod.c
rename to drivers/media/usb/dvb-usb/mxl111sf-demod.c
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.h b/drivers/media/usb/dvb-usb/mxl111sf-demod.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-demod.h
rename to drivers/media/usb/dvb-usb/mxl111sf-demod.h
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-gpio.c b/drivers/media/usb/dvb-usb/mxl111sf-gpio.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-gpio.c
rename to drivers/media/usb/dvb-usb/mxl111sf-gpio.c
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-gpio.h b/drivers/media/usb/dvb-usb/mxl111sf-gpio.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-gpio.h
rename to drivers/media/usb/dvb-usb/mxl111sf-gpio.h
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-i2c.c b/drivers/media/usb/dvb-usb/mxl111sf-i2c.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-i2c.c
rename to drivers/media/usb/dvb-usb/mxl111sf-i2c.c
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-i2c.h b/drivers/media/usb/dvb-usb/mxl111sf-i2c.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-i2c.h
rename to drivers/media/usb/dvb-usb/mxl111sf-i2c.h
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-phy.c b/drivers/media/usb/dvb-usb/mxl111sf-phy.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-phy.c
rename to drivers/media/usb/dvb-usb/mxl111sf-phy.c
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-phy.h b/drivers/media/usb/dvb-usb/mxl111sf-phy.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-phy.h
rename to drivers/media/usb/dvb-usb/mxl111sf-phy.h
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-reg.h b/drivers/media/usb/dvb-usb/mxl111sf-reg.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-reg.h
rename to drivers/media/usb/dvb-usb/mxl111sf-reg.h
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c b/drivers/media/usb/dvb-usb/mxl111sf-tuner.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
rename to drivers/media/usb/dvb-usb/mxl111sf-tuner.c
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-tuner.h b/drivers/media/usb/dvb-usb/mxl111sf-tuner.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf-tuner.h
rename to drivers/media/usb/dvb-usb/mxl111sf-tuner.h
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.c b/drivers/media/usb/dvb-usb/mxl111sf.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf.c
rename to drivers/media/usb/dvb-usb/mxl111sf.c
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.h b/drivers/media/usb/dvb-usb/mxl111sf.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/mxl111sf.h
rename to drivers/media/usb/dvb-usb/mxl111sf.h
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/usb/dvb-usb/nova-t-usb2.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/nova-t-usb2.c
rename to drivers/media/usb/dvb-usb/nova-t-usb2.c
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/opera1.c
rename to drivers/media/usb/dvb-usb/opera1.c
diff --git a/drivers/media/dvb/dvb-usb/pctv452e.c b/drivers/media/usb/dvb-usb/pctv452e.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/pctv452e.c
rename to drivers/media/usb/dvb-usb/pctv452e.c
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/usb/dvb-usb/rtl28xxu.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/rtl28xxu.c
rename to drivers/media/usb/dvb-usb/rtl28xxu.c
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.h b/drivers/media/usb/dvb-usb/rtl28xxu.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/rtl28xxu.h
rename to drivers/media/usb/dvb-usb/rtl28xxu.h
diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/technisat-usb2.c
rename to drivers/media/usb/dvb-usb/technisat-usb2.c
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ttusb2.c
rename to drivers/media/usb/dvb-usb/ttusb2.c
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.h b/drivers/media/usb/dvb-usb/ttusb2.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ttusb2.h
rename to drivers/media/usb/dvb-usb/ttusb2.h
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/usb/dvb-usb/umt-010.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/umt-010.c
rename to drivers/media/usb/dvb-usb/umt-010.c
diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/usb/dvb-usb/usb-urb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/usb-urb.c
rename to drivers/media/usb/dvb-usb/usb-urb.c
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/usb/dvb-usb/vp702x-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp702x-fe.c
rename to drivers/media/usb/dvb-usb/vp702x-fe.c
diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/usb/dvb-usb/vp702x.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp702x.c
rename to drivers/media/usb/dvb-usb/vp702x.c
diff --git a/drivers/media/dvb/dvb-usb/vp702x.h b/drivers/media/usb/dvb-usb/vp702x.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp702x.h
rename to drivers/media/usb/dvb-usb/vp702x.h
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/usb/dvb-usb/vp7045-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp7045-fe.c
rename to drivers/media/usb/dvb-usb/vp7045-fe.c
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/usb/dvb-usb/vp7045.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp7045.c
rename to drivers/media/usb/dvb-usb/vp7045.c
diff --git a/drivers/media/dvb/dvb-usb/vp7045.h b/drivers/media/usb/dvb-usb/vp7045.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp7045.h
rename to drivers/media/usb/dvb-usb/vp7045.h
diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/usb/siano/Kconfig
similarity index 100%
rename from drivers/media/dvb/siano/Kconfig
rename to drivers/media/usb/siano/Kconfig
diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/usb/siano/Makefile
similarity index 100%
rename from drivers/media/dvb/siano/Makefile
rename to drivers/media/usb/siano/Makefile
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/usb/siano/sms-cards.c
similarity index 100%
rename from drivers/media/dvb/siano/sms-cards.c
rename to drivers/media/usb/siano/sms-cards.c
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/usb/siano/sms-cards.h
similarity index 100%
rename from drivers/media/dvb/siano/sms-cards.h
rename to drivers/media/usb/siano/sms-cards.h
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/usb/siano/smscoreapi.c
similarity index 100%
rename from drivers/media/dvb/siano/smscoreapi.c
rename to drivers/media/usb/siano/smscoreapi.c
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/usb/siano/smscoreapi.h
similarity index 100%
rename from drivers/media/dvb/siano/smscoreapi.h
rename to drivers/media/usb/siano/smscoreapi.h
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/usb/siano/smsdvb.c
similarity index 100%
rename from drivers/media/dvb/siano/smsdvb.c
rename to drivers/media/usb/siano/smsdvb.c
diff --git a/drivers/media/dvb/siano/smsendian.c b/drivers/media/usb/siano/smsendian.c
similarity index 100%
rename from drivers/media/dvb/siano/smsendian.c
rename to drivers/media/usb/siano/smsendian.c
diff --git a/drivers/media/dvb/siano/smsendian.h b/drivers/media/usb/siano/smsendian.h
similarity index 100%
rename from drivers/media/dvb/siano/smsendian.h
rename to drivers/media/usb/siano/smsendian.h
diff --git a/drivers/media/dvb/siano/smsir.c b/drivers/media/usb/siano/smsir.c
similarity index 100%
rename from drivers/media/dvb/siano/smsir.c
rename to drivers/media/usb/siano/smsir.c
diff --git a/drivers/media/dvb/siano/smsir.h b/drivers/media/usb/siano/smsir.h
similarity index 100%
rename from drivers/media/dvb/siano/smsir.h
rename to drivers/media/usb/siano/smsir.h
diff --git a/drivers/media/dvb/siano/smssdio.c b/drivers/media/usb/siano/smssdio.c
similarity index 100%
rename from drivers/media/dvb/siano/smssdio.c
rename to drivers/media/usb/siano/smssdio.c
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
similarity index 100%
rename from drivers/media/dvb/siano/smsusb.c
rename to drivers/media/usb/siano/smsusb.c
diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/usb/ttusb-budget/Kconfig
similarity index 100%
rename from drivers/media/dvb/ttusb-budget/Kconfig
rename to drivers/media/usb/ttusb-budget/Kconfig
diff --git a/drivers/media/dvb/ttusb-budget/Makefile b/drivers/media/usb/ttusb-budget/Makefile
similarity index 100%
rename from drivers/media/dvb/ttusb-budget/Makefile
rename to drivers/media/usb/ttusb-budget/Makefile
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
similarity index 100%
rename from drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
rename to drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
diff --git a/drivers/media/dvb/ttusb-dec/Kconfig b/drivers/media/usb/ttusb-dec/Kconfig
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/Kconfig
rename to drivers/media/usb/ttusb-dec/Kconfig
diff --git a/drivers/media/dvb/ttusb-dec/Makefile b/drivers/media/usb/ttusb-dec/Makefile
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/Makefile
rename to drivers/media/usb/ttusb-dec/Makefile
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/ttusb_dec.c
rename to drivers/media/usb/ttusb-dec/ttusb_dec.c
diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/usb/ttusb-dec/ttusbdecfe.c
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/ttusbdecfe.c
rename to drivers/media/usb/ttusb-dec/ttusbdecfe.c
diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.h b/drivers/media/usb/ttusb-dec/ttusbdecfe.h
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/ttusbdecfe.h
rename to drivers/media/usb/ttusb-dec/ttusbdecfe.h
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
index 2697325..fe5706d 100644
--- a/drivers/media/video/cx231xx/Makefile
+++ b/drivers/media/video/cx231xx/Makefile
@@ -12,5 +12,5 @@ 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/dvb-usb
+ccflags-y += -Idrivers/media/usb/dvb-usb
diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index f654ddc..3fdbef5 100644
--- a/drivers/staging/media/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
@@ -24,7 +24,7 @@ s2250-y := s2250-board.o
#ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3
# S2250 needs cypress ezusb loader from dvb-usb
-ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb
+ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/usb/dvb-usb
ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/dvb-core
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 06/10] [media] Rename media/dvb as media/pci
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (4 preceding siblings ...)
2012-06-14 20:35 ` [PATCH RFC 05/10] [media] dvb-usb: move it to drivers/media/usb/dvb-usb Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 07/10] [media] b2c2: break it into common/pci/usb directories Mauro Carvalho Chehab
` (4 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
The remaining dvb drivers are pci, so rename them to match the
bus.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
Documentation/DocBook/media/dvb/kdapi.xml | 2 +-
drivers/media/Kconfig | 2 +-
drivers/media/Makefile | 2 +-
drivers/media/{dvb => pci}/Kconfig | 18 +++++++++---------
drivers/media/{dvb => pci}/Makefile | 0
drivers/media/{dvb => pci}/b2c2/Kconfig | 0
drivers/media/{dvb => pci}/b2c2/Makefile | 0
drivers/media/{dvb => pci}/b2c2/flexcop-common.h | 0
drivers/media/{dvb => pci}/b2c2/flexcop-dma.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-eeprom.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-fe-tuner.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-hw-filter.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-i2c.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-misc.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-pci.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-reg.h | 0
drivers/media/{dvb => pci}/b2c2/flexcop-sram.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-usb.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop-usb.h | 0
drivers/media/{dvb => pci}/b2c2/flexcop.c | 0
drivers/media/{dvb => pci}/b2c2/flexcop.h | 0
.../media/{dvb => pci}/b2c2/flexcop_ibi_value_be.h | 0
.../media/{dvb => pci}/b2c2/flexcop_ibi_value_le.h | 0
drivers/media/{dvb => pci}/bt8xx/Kconfig | 0
drivers/media/{dvb => pci}/bt8xx/Makefile | 0
drivers/media/{dvb => pci}/bt8xx/bt878.c | 0
drivers/media/{dvb => pci}/bt8xx/bt878.h | 0
drivers/media/{dvb => pci}/bt8xx/dst.c | 0
drivers/media/{dvb => pci}/bt8xx/dst_ca.c | 0
drivers/media/{dvb => pci}/bt8xx/dst_ca.h | 0
drivers/media/{dvb => pci}/bt8xx/dst_common.h | 0
drivers/media/{dvb => pci}/bt8xx/dst_priv.h | 0
drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c | 0
drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h | 0
drivers/media/{dvb => pci}/ddbridge/Kconfig | 0
drivers/media/{dvb => pci}/ddbridge/Makefile | 0
drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c | 0
drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h | 0
drivers/media/{dvb => pci}/ddbridge/ddbridge.h | 0
drivers/media/{dvb => pci}/dm1105/Kconfig | 0
drivers/media/{dvb => pci}/dm1105/Makefile | 0
drivers/media/{dvb => pci}/dm1105/dm1105.c | 0
drivers/media/{dvb => pci}/mantis/Kconfig | 0
drivers/media/{dvb => pci}/mantis/Makefile | 0
drivers/media/{dvb => pci}/mantis/hopper_cards.c | 0
drivers/media/{dvb => pci}/mantis/hopper_vp3028.c | 0
drivers/media/{dvb => pci}/mantis/hopper_vp3028.h | 0
drivers/media/{dvb => pci}/mantis/mantis_ca.c | 0
drivers/media/{dvb => pci}/mantis/mantis_ca.h | 0
drivers/media/{dvb => pci}/mantis/mantis_cards.c | 0
drivers/media/{dvb => pci}/mantis/mantis_common.h | 0
drivers/media/{dvb => pci}/mantis/mantis_core.c | 0
drivers/media/{dvb => pci}/mantis/mantis_core.h | 0
drivers/media/{dvb => pci}/mantis/mantis_dma.c | 0
drivers/media/{dvb => pci}/mantis/mantis_dma.h | 0
drivers/media/{dvb => pci}/mantis/mantis_dvb.c | 0
drivers/media/{dvb => pci}/mantis/mantis_dvb.h | 0
drivers/media/{dvb => pci}/mantis/mantis_evm.c | 0
drivers/media/{dvb => pci}/mantis/mantis_hif.c | 0
drivers/media/{dvb => pci}/mantis/mantis_hif.h | 0
drivers/media/{dvb => pci}/mantis/mantis_i2c.c | 0
drivers/media/{dvb => pci}/mantis/mantis_i2c.h | 0
drivers/media/{dvb => pci}/mantis/mantis_input.c | 0
drivers/media/{dvb => pci}/mantis/mantis_ioc.c | 0
drivers/media/{dvb => pci}/mantis/mantis_ioc.h | 0
drivers/media/{dvb => pci}/mantis/mantis_link.h | 0
drivers/media/{dvb => pci}/mantis/mantis_pci.c | 0
drivers/media/{dvb => pci}/mantis/mantis_pci.h | 0
drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c | 0
drivers/media/{dvb => pci}/mantis/mantis_reg.h | 0
drivers/media/{dvb => pci}/mantis/mantis_uart.c | 0
drivers/media/{dvb => pci}/mantis/mantis_uart.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1033.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1033.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1034.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1034.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1041.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp1041.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2033.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2033.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2040.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp2040.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3028.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3028.h | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3030.c | 0
drivers/media/{dvb => pci}/mantis/mantis_vp3030.h | 0
drivers/media/{dvb => pci}/ngene/Kconfig | 0
drivers/media/{dvb => pci}/ngene/Makefile | 0
drivers/media/{dvb => pci}/ngene/ngene-cards.c | 0
drivers/media/{dvb => pci}/ngene/ngene-core.c | 0
drivers/media/{dvb => pci}/ngene/ngene-dvb.c | 0
drivers/media/{dvb => pci}/ngene/ngene-i2c.c | 0
drivers/media/{dvb => pci}/ngene/ngene.h | 0
drivers/media/{dvb => pci}/pluto2/Kconfig | 0
drivers/media/{dvb => pci}/pluto2/Makefile | 0
drivers/media/{dvb => pci}/pluto2/pluto2.c | 0
drivers/media/{dvb => pci}/pt1/Kconfig | 0
drivers/media/{dvb => pci}/pt1/Makefile | 0
drivers/media/{dvb => pci}/pt1/pt1.c | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c | 0
drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h | 0
drivers/media/{dvb => pci}/ttpci/Kconfig | 0
drivers/media/{dvb => pci}/ttpci/Makefile | 0
drivers/media/{dvb => pci}/ttpci/av7110.c | 0
drivers/media/{dvb => pci}/ttpci/av7110.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_av.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_av.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_ca.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_ca.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_hw.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_hw.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_ipack.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_ipack.h | 0
drivers/media/{dvb => pci}/ttpci/av7110_ir.c | 0
drivers/media/{dvb => pci}/ttpci/av7110_v4l.c | 0
drivers/media/{dvb => pci}/ttpci/budget-av.c | 0
drivers/media/{dvb => pci}/ttpci/budget-ci.c | 0
drivers/media/{dvb => pci}/ttpci/budget-core.c | 0
drivers/media/{dvb => pci}/ttpci/budget-patch.c | 0
drivers/media/{dvb => pci}/ttpci/budget.c | 0
drivers/media/{dvb => pci}/ttpci/budget.h | 0
drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c | 0
drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h | 0
drivers/media/usb/dvb-usb/Makefile | 2 +-
126 files changed, 13 insertions(+), 13 deletions(-)
rename drivers/media/{dvb => pci}/Kconfig (71%)
rename drivers/media/{dvb => pci}/Makefile (100%)
rename drivers/media/{dvb => pci}/b2c2/Kconfig (100%)
rename drivers/media/{dvb => pci}/b2c2/Makefile (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-common.h (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-dma.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-eeprom.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-fe-tuner.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-hw-filter.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-i2c.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-misc.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-pci.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-reg.h (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-sram.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-usb.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop-usb.h (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop.c (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop.h (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop_ibi_value_be.h (100%)
rename drivers/media/{dvb => pci}/b2c2/flexcop_ibi_value_le.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/Kconfig (100%)
rename drivers/media/{dvb => pci}/bt8xx/Makefile (100%)
rename drivers/media/{dvb => pci}/bt8xx/bt878.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/bt878.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_ca.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_ca.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_common.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dst_priv.h (100%)
rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c (100%)
rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h (100%)
rename drivers/media/{dvb => pci}/ddbridge/Kconfig (100%)
rename drivers/media/{dvb => pci}/ddbridge/Makefile (100%)
rename drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c (100%)
rename drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h (100%)
rename drivers/media/{dvb => pci}/ddbridge/ddbridge.h (100%)
rename drivers/media/{dvb => pci}/dm1105/Kconfig (100%)
rename drivers/media/{dvb => pci}/dm1105/Makefile (100%)
rename drivers/media/{dvb => pci}/dm1105/dm1105.c (100%)
rename drivers/media/{dvb => pci}/mantis/Kconfig (100%)
rename drivers/media/{dvb => pci}/mantis/Makefile (100%)
rename drivers/media/{dvb => pci}/mantis/hopper_cards.c (100%)
rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.c (100%)
rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ca.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ca.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_cards.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_common.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_core.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_core.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dma.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dma.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dvb.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_dvb.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_evm.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_hif.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_hif.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_i2c.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_i2c.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_input.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ioc.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_ioc.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_link.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_pci.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_pci.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_reg.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_uart.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_uart.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.h (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.c (100%)
rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.h (100%)
rename drivers/media/{dvb => pci}/ngene/Kconfig (100%)
rename drivers/media/{dvb => pci}/ngene/Makefile (100%)
rename drivers/media/{dvb => pci}/ngene/ngene-cards.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene-core.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene-dvb.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene-i2c.c (100%)
rename drivers/media/{dvb => pci}/ngene/ngene.h (100%)
rename drivers/media/{dvb => pci}/pluto2/Kconfig (100%)
rename drivers/media/{dvb => pci}/pluto2/Makefile (100%)
rename drivers/media/{dvb => pci}/pluto2/pluto2.c (100%)
rename drivers/media/{dvb => pci}/pt1/Kconfig (100%)
rename drivers/media/{dvb => pci}/pt1/Makefile (100%)
rename drivers/media/{dvb => pci}/pt1/pt1.c (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c (100%)
rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h (100%)
rename drivers/media/{dvb => pci}/ttpci/Kconfig (100%)
rename drivers/media/{dvb => pci}/ttpci/Makefile (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_av.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_av.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ca.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ca.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_hw.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_hw.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.h (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_ir.c (100%)
rename drivers/media/{dvb => pci}/ttpci/av7110_v4l.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-av.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-ci.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-core.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget-patch.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget.c (100%)
rename drivers/media/{dvb => pci}/ttpci/budget.h (100%)
rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c (100%)
rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h (100%)
diff --git a/Documentation/DocBook/media/dvb/kdapi.xml b/Documentation/DocBook/media/dvb/kdapi.xml
index 6c67481..6c11ec5 100644
--- a/Documentation/DocBook/media/dvb/kdapi.xml
+++ b/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>
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index d71a855..bd415c4 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -164,7 +164,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"
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 46a8dc3..90ec998 100644
--- a/drivers/media/Makefile
+++ b/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/
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/pci/Kconfig
similarity index 71%
rename from drivers/media/dvb/Kconfig
rename to drivers/media/pci/Kconfig
index e2565a4..3b9164a 100644
--- a/drivers/media/dvb/Kconfig
+++ b/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
diff --git a/drivers/media/dvb/Makefile b/drivers/media/pci/Makefile
similarity index 100%
rename from drivers/media/dvb/Makefile
rename to drivers/media/pci/Makefile
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/pci/b2c2/Kconfig
similarity index 100%
rename from drivers/media/dvb/b2c2/Kconfig
rename to drivers/media/pci/b2c2/Kconfig
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/pci/b2c2/Makefile
similarity index 100%
rename from drivers/media/dvb/b2c2/Makefile
rename to drivers/media/pci/b2c2/Makefile
diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/pci/b2c2/flexcop-common.h
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-common.h
rename to drivers/media/pci/b2c2/flexcop-common.h
diff --git a/drivers/media/dvb/b2c2/flexcop-dma.c b/drivers/media/pci/b2c2/flexcop-dma.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-dma.c
rename to drivers/media/pci/b2c2/flexcop-dma.c
diff --git a/drivers/media/dvb/b2c2/flexcop-eeprom.c b/drivers/media/pci/b2c2/flexcop-eeprom.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-eeprom.c
rename to drivers/media/pci/b2c2/flexcop-eeprom.c
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/pci/b2c2/flexcop-fe-tuner.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-fe-tuner.c
rename to drivers/media/pci/b2c2/flexcop-fe-tuner.c
diff --git a/drivers/media/dvb/b2c2/flexcop-hw-filter.c b/drivers/media/pci/b2c2/flexcop-hw-filter.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-hw-filter.c
rename to drivers/media/pci/b2c2/flexcop-hw-filter.c
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/pci/b2c2/flexcop-i2c.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-i2c.c
rename to drivers/media/pci/b2c2/flexcop-i2c.c
diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/pci/b2c2/flexcop-misc.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-misc.c
rename to drivers/media/pci/b2c2/flexcop-misc.c
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-pci.c
rename to drivers/media/pci/b2c2/flexcop-pci.c
diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/pci/b2c2/flexcop-reg.h
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-reg.h
rename to drivers/media/pci/b2c2/flexcop-reg.h
diff --git a/drivers/media/dvb/b2c2/flexcop-sram.c b/drivers/media/pci/b2c2/flexcop-sram.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-sram.c
rename to drivers/media/pci/b2c2/flexcop-sram.c
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/pci/b2c2/flexcop-usb.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-usb.c
rename to drivers/media/pci/b2c2/flexcop-usb.c
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.h b/drivers/media/pci/b2c2/flexcop-usb.h
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop-usb.h
rename to drivers/media/pci/b2c2/flexcop-usb.h
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/pci/b2c2/flexcop.c
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop.c
rename to drivers/media/pci/b2c2/flexcop.c
diff --git a/drivers/media/dvb/b2c2/flexcop.h b/drivers/media/pci/b2c2/flexcop.h
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop.h
rename to drivers/media/pci/b2c2/flexcop.h
diff --git a/drivers/media/dvb/b2c2/flexcop_ibi_value_be.h b/drivers/media/pci/b2c2/flexcop_ibi_value_be.h
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop_ibi_value_be.h
rename to drivers/media/pci/b2c2/flexcop_ibi_value_be.h
diff --git a/drivers/media/dvb/b2c2/flexcop_ibi_value_le.h b/drivers/media/pci/b2c2/flexcop_ibi_value_le.h
similarity index 100%
rename from drivers/media/dvb/b2c2/flexcop_ibi_value_le.h
rename to drivers/media/pci/b2c2/flexcop_ibi_value_le.h
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig
similarity index 100%
rename from drivers/media/dvb/bt8xx/Kconfig
rename to drivers/media/pci/bt8xx/Kconfig
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/pci/bt8xx/Makefile
similarity index 100%
rename from drivers/media/dvb/bt8xx/Makefile
rename to drivers/media/pci/bt8xx/Makefile
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c
similarity index 100%
rename from drivers/media/dvb/bt8xx/bt878.c
rename to drivers/media/pci/bt8xx/bt878.c
diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/pci/bt8xx/bt878.h
similarity index 100%
rename from drivers/media/dvb/bt8xx/bt878.h
rename to drivers/media/pci/bt8xx/bt878.h
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c
similarity index 100%
rename from drivers/media/dvb/bt8xx/dst.c
rename to drivers/media/pci/bt8xx/dst.c
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/pci/bt8xx/dst_ca.c
similarity index 100%
rename from drivers/media/dvb/bt8xx/dst_ca.c
rename to drivers/media/pci/bt8xx/dst_ca.c
diff --git a/drivers/media/dvb/bt8xx/dst_ca.h b/drivers/media/pci/bt8xx/dst_ca.h
similarity index 100%
rename from drivers/media/dvb/bt8xx/dst_ca.h
rename to drivers/media/pci/bt8xx/dst_ca.h
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/pci/bt8xx/dst_common.h
similarity index 100%
rename from drivers/media/dvb/bt8xx/dst_common.h
rename to drivers/media/pci/bt8xx/dst_common.h
diff --git a/drivers/media/dvb/bt8xx/dst_priv.h b/drivers/media/pci/bt8xx/dst_priv.h
similarity index 100%
rename from drivers/media/dvb/bt8xx/dst_priv.h
rename to drivers/media/pci/bt8xx/dst_priv.h
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c
similarity index 100%
rename from drivers/media/dvb/bt8xx/dvb-bt8xx.c
rename to drivers/media/pci/bt8xx/dvb-bt8xx.c
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/pci/bt8xx/dvb-bt8xx.h
similarity index 100%
rename from drivers/media/dvb/bt8xx/dvb-bt8xx.h
rename to drivers/media/pci/bt8xx/dvb-bt8xx.h
diff --git a/drivers/media/dvb/ddbridge/Kconfig b/drivers/media/pci/ddbridge/Kconfig
similarity index 100%
rename from drivers/media/dvb/ddbridge/Kconfig
rename to drivers/media/pci/ddbridge/Kconfig
diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/pci/ddbridge/Makefile
similarity index 100%
rename from drivers/media/dvb/ddbridge/Makefile
rename to drivers/media/pci/ddbridge/Makefile
diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
similarity index 100%
rename from drivers/media/dvb/ddbridge/ddbridge-core.c
rename to drivers/media/pci/ddbridge/ddbridge-core.c
diff --git a/drivers/media/dvb/ddbridge/ddbridge-regs.h b/drivers/media/pci/ddbridge/ddbridge-regs.h
similarity index 100%
rename from drivers/media/dvb/ddbridge/ddbridge-regs.h
rename to drivers/media/pci/ddbridge/ddbridge-regs.h
diff --git a/drivers/media/dvb/ddbridge/ddbridge.h b/drivers/media/pci/ddbridge/ddbridge.h
similarity index 100%
rename from drivers/media/dvb/ddbridge/ddbridge.h
rename to drivers/media/pci/ddbridge/ddbridge.h
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/pci/dm1105/Kconfig
similarity index 100%
rename from drivers/media/dvb/dm1105/Kconfig
rename to drivers/media/pci/dm1105/Kconfig
diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/pci/dm1105/Makefile
similarity index 100%
rename from drivers/media/dvb/dm1105/Makefile
rename to drivers/media/pci/dm1105/Makefile
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
similarity index 100%
rename from drivers/media/dvb/dm1105/dm1105.c
rename to drivers/media/pci/dm1105/dm1105.c
diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/pci/mantis/Kconfig
similarity index 100%
rename from drivers/media/dvb/mantis/Kconfig
rename to drivers/media/pci/mantis/Kconfig
diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/pci/mantis/Makefile
similarity index 100%
rename from drivers/media/dvb/mantis/Makefile
rename to drivers/media/pci/mantis/Makefile
diff --git a/drivers/media/dvb/mantis/hopper_cards.c b/drivers/media/pci/mantis/hopper_cards.c
similarity index 100%
rename from drivers/media/dvb/mantis/hopper_cards.c
rename to drivers/media/pci/mantis/hopper_cards.c
diff --git a/drivers/media/dvb/mantis/hopper_vp3028.c b/drivers/media/pci/mantis/hopper_vp3028.c
similarity index 100%
rename from drivers/media/dvb/mantis/hopper_vp3028.c
rename to drivers/media/pci/mantis/hopper_vp3028.c
diff --git a/drivers/media/dvb/mantis/hopper_vp3028.h b/drivers/media/pci/mantis/hopper_vp3028.h
similarity index 100%
rename from drivers/media/dvb/mantis/hopper_vp3028.h
rename to drivers/media/pci/mantis/hopper_vp3028.h
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/pci/mantis/mantis_ca.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_ca.c
rename to drivers/media/pci/mantis/mantis_ca.c
diff --git a/drivers/media/dvb/mantis/mantis_ca.h b/drivers/media/pci/mantis/mantis_ca.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_ca.h
rename to drivers/media/pci/mantis/mantis_ca.h
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/pci/mantis/mantis_cards.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_cards.c
rename to drivers/media/pci/mantis/mantis_cards.c
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/pci/mantis/mantis_common.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_common.h
rename to drivers/media/pci/mantis/mantis_common.h
diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/pci/mantis/mantis_core.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_core.c
rename to drivers/media/pci/mantis/mantis_core.c
diff --git a/drivers/media/dvb/mantis/mantis_core.h b/drivers/media/pci/mantis/mantis_core.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_core.h
rename to drivers/media/pci/mantis/mantis_core.h
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/pci/mantis/mantis_dma.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_dma.c
rename to drivers/media/pci/mantis/mantis_dma.c
diff --git a/drivers/media/dvb/mantis/mantis_dma.h b/drivers/media/pci/mantis/mantis_dma.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_dma.h
rename to drivers/media/pci/mantis/mantis_dma.h
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/pci/mantis/mantis_dvb.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_dvb.c
rename to drivers/media/pci/mantis/mantis_dvb.c
diff --git a/drivers/media/dvb/mantis/mantis_dvb.h b/drivers/media/pci/mantis/mantis_dvb.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_dvb.h
rename to drivers/media/pci/mantis/mantis_dvb.h
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/pci/mantis/mantis_evm.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_evm.c
rename to drivers/media/pci/mantis/mantis_evm.c
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/pci/mantis/mantis_hif.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_hif.c
rename to drivers/media/pci/mantis/mantis_hif.c
diff --git a/drivers/media/dvb/mantis/mantis_hif.h b/drivers/media/pci/mantis/mantis_hif.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_hif.h
rename to drivers/media/pci/mantis/mantis_hif.h
diff --git a/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/pci/mantis/mantis_i2c.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_i2c.c
rename to drivers/media/pci/mantis/mantis_i2c.c
diff --git a/drivers/media/dvb/mantis/mantis_i2c.h b/drivers/media/pci/mantis/mantis_i2c.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_i2c.h
rename to drivers/media/pci/mantis/mantis_i2c.h
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/pci/mantis/mantis_input.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_input.c
rename to drivers/media/pci/mantis/mantis_input.c
diff --git a/drivers/media/dvb/mantis/mantis_ioc.c b/drivers/media/pci/mantis/mantis_ioc.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_ioc.c
rename to drivers/media/pci/mantis/mantis_ioc.c
diff --git a/drivers/media/dvb/mantis/mantis_ioc.h b/drivers/media/pci/mantis/mantis_ioc.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_ioc.h
rename to drivers/media/pci/mantis/mantis_ioc.h
diff --git a/drivers/media/dvb/mantis/mantis_link.h b/drivers/media/pci/mantis/mantis_link.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_link.h
rename to drivers/media/pci/mantis/mantis_link.h
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_pci.c
rename to drivers/media/pci/mantis/mantis_pci.c
diff --git a/drivers/media/dvb/mantis/mantis_pci.h b/drivers/media/pci/mantis/mantis_pci.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_pci.h
rename to drivers/media/pci/mantis/mantis_pci.h
diff --git a/drivers/media/dvb/mantis/mantis_pcmcia.c b/drivers/media/pci/mantis/mantis_pcmcia.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_pcmcia.c
rename to drivers/media/pci/mantis/mantis_pcmcia.c
diff --git a/drivers/media/dvb/mantis/mantis_reg.h b/drivers/media/pci/mantis/mantis_reg.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_reg.h
rename to drivers/media/pci/mantis/mantis_reg.h
diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/pci/mantis/mantis_uart.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_uart.c
rename to drivers/media/pci/mantis/mantis_uart.c
diff --git a/drivers/media/dvb/mantis/mantis_uart.h b/drivers/media/pci/mantis/mantis_uart.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_uart.h
rename to drivers/media/pci/mantis/mantis_uart.h
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/pci/mantis/mantis_vp1033.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp1033.c
rename to drivers/media/pci/mantis/mantis_vp1033.c
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.h b/drivers/media/pci/mantis/mantis_vp1033.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp1033.h
rename to drivers/media/pci/mantis/mantis_vp1033.h
diff --git a/drivers/media/dvb/mantis/mantis_vp1034.c b/drivers/media/pci/mantis/mantis_vp1034.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp1034.c
rename to drivers/media/pci/mantis/mantis_vp1034.c
diff --git a/drivers/media/dvb/mantis/mantis_vp1034.h b/drivers/media/pci/mantis/mantis_vp1034.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp1034.h
rename to drivers/media/pci/mantis/mantis_vp1034.h
diff --git a/drivers/media/dvb/mantis/mantis_vp1041.c b/drivers/media/pci/mantis/mantis_vp1041.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp1041.c
rename to drivers/media/pci/mantis/mantis_vp1041.c
diff --git a/drivers/media/dvb/mantis/mantis_vp1041.h b/drivers/media/pci/mantis/mantis_vp1041.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp1041.h
rename to drivers/media/pci/mantis/mantis_vp1041.h
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/pci/mantis/mantis_vp2033.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp2033.c
rename to drivers/media/pci/mantis/mantis_vp2033.c
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.h b/drivers/media/pci/mantis/mantis_vp2033.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp2033.h
rename to drivers/media/pci/mantis/mantis_vp2033.h
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/pci/mantis/mantis_vp2040.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp2040.c
rename to drivers/media/pci/mantis/mantis_vp2040.c
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.h b/drivers/media/pci/mantis/mantis_vp2040.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp2040.h
rename to drivers/media/pci/mantis/mantis_vp2040.h
diff --git a/drivers/media/dvb/mantis/mantis_vp3028.c b/drivers/media/pci/mantis/mantis_vp3028.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp3028.c
rename to drivers/media/pci/mantis/mantis_vp3028.c
diff --git a/drivers/media/dvb/mantis/mantis_vp3028.h b/drivers/media/pci/mantis/mantis_vp3028.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp3028.h
rename to drivers/media/pci/mantis/mantis_vp3028.h
diff --git a/drivers/media/dvb/mantis/mantis_vp3030.c b/drivers/media/pci/mantis/mantis_vp3030.c
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp3030.c
rename to drivers/media/pci/mantis/mantis_vp3030.c
diff --git a/drivers/media/dvb/mantis/mantis_vp3030.h b/drivers/media/pci/mantis/mantis_vp3030.h
similarity index 100%
rename from drivers/media/dvb/mantis/mantis_vp3030.h
rename to drivers/media/pci/mantis/mantis_vp3030.h
diff --git a/drivers/media/dvb/ngene/Kconfig b/drivers/media/pci/ngene/Kconfig
similarity index 100%
rename from drivers/media/dvb/ngene/Kconfig
rename to drivers/media/pci/ngene/Kconfig
diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/pci/ngene/Makefile
similarity index 100%
rename from drivers/media/dvb/ngene/Makefile
rename to drivers/media/pci/ngene/Makefile
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
similarity index 100%
rename from drivers/media/dvb/ngene/ngene-cards.c
rename to drivers/media/pci/ngene/ngene-cards.c
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
similarity index 100%
rename from drivers/media/dvb/ngene/ngene-core.c
rename to drivers/media/pci/ngene/ngene-core.c
diff --git a/drivers/media/dvb/ngene/ngene-dvb.c b/drivers/media/pci/ngene/ngene-dvb.c
similarity index 100%
rename from drivers/media/dvb/ngene/ngene-dvb.c
rename to drivers/media/pci/ngene/ngene-dvb.c
diff --git a/drivers/media/dvb/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c
similarity index 100%
rename from drivers/media/dvb/ngene/ngene-i2c.c
rename to drivers/media/pci/ngene/ngene-i2c.c
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/pci/ngene/ngene.h
similarity index 100%
rename from drivers/media/dvb/ngene/ngene.h
rename to drivers/media/pci/ngene/ngene.h
diff --git a/drivers/media/dvb/pluto2/Kconfig b/drivers/media/pci/pluto2/Kconfig
similarity index 100%
rename from drivers/media/dvb/pluto2/Kconfig
rename to drivers/media/pci/pluto2/Kconfig
diff --git a/drivers/media/dvb/pluto2/Makefile b/drivers/media/pci/pluto2/Makefile
similarity index 100%
rename from drivers/media/dvb/pluto2/Makefile
rename to drivers/media/pci/pluto2/Makefile
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
similarity index 100%
rename from drivers/media/dvb/pluto2/pluto2.c
rename to drivers/media/pci/pluto2/pluto2.c
diff --git a/drivers/media/dvb/pt1/Kconfig b/drivers/media/pci/pt1/Kconfig
similarity index 100%
rename from drivers/media/dvb/pt1/Kconfig
rename to drivers/media/pci/pt1/Kconfig
diff --git a/drivers/media/dvb/pt1/Makefile b/drivers/media/pci/pt1/Makefile
similarity index 100%
rename from drivers/media/dvb/pt1/Makefile
rename to drivers/media/pci/pt1/Makefile
diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c
similarity index 100%
rename from drivers/media/dvb/pt1/pt1.c
rename to drivers/media/pci/pt1/pt1.c
diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.c b/drivers/media/pci/pt1/va1j5jf8007s.c
similarity index 100%
rename from drivers/media/dvb/pt1/va1j5jf8007s.c
rename to drivers/media/pci/pt1/va1j5jf8007s.c
diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.h b/drivers/media/pci/pt1/va1j5jf8007s.h
similarity index 100%
rename from drivers/media/dvb/pt1/va1j5jf8007s.h
rename to drivers/media/pci/pt1/va1j5jf8007s.h
diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.c b/drivers/media/pci/pt1/va1j5jf8007t.c
similarity index 100%
rename from drivers/media/dvb/pt1/va1j5jf8007t.c
rename to drivers/media/pci/pt1/va1j5jf8007t.c
diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.h b/drivers/media/pci/pt1/va1j5jf8007t.h
similarity index 100%
rename from drivers/media/dvb/pt1/va1j5jf8007t.h
rename to drivers/media/pci/pt1/va1j5jf8007t.h
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/pci/ttpci/Kconfig
similarity index 100%
rename from drivers/media/dvb/ttpci/Kconfig
rename to drivers/media/pci/ttpci/Kconfig
diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/pci/ttpci/Makefile
similarity index 100%
rename from drivers/media/dvb/ttpci/Makefile
rename to drivers/media/pci/ttpci/Makefile
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110.c
rename to drivers/media/pci/ttpci/av7110.c
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/pci/ttpci/av7110.h
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110.h
rename to drivers/media/pci/ttpci/av7110.h
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/pci/ttpci/av7110_av.c
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_av.c
rename to drivers/media/pci/ttpci/av7110_av.c
diff --git a/drivers/media/dvb/ttpci/av7110_av.h b/drivers/media/pci/ttpci/av7110_av.h
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_av.h
rename to drivers/media/pci/ttpci/av7110_av.h
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/pci/ttpci/av7110_ca.c
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_ca.c
rename to drivers/media/pci/ttpci/av7110_ca.c
diff --git a/drivers/media/dvb/ttpci/av7110_ca.h b/drivers/media/pci/ttpci/av7110_ca.h
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_ca.h
rename to drivers/media/pci/ttpci/av7110_ca.h
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_hw.c
rename to drivers/media/pci/ttpci/av7110_hw.c
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/pci/ttpci/av7110_hw.h
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_hw.h
rename to drivers/media/pci/ttpci/av7110_hw.h
diff --git a/drivers/media/dvb/ttpci/av7110_ipack.c b/drivers/media/pci/ttpci/av7110_ipack.c
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_ipack.c
rename to drivers/media/pci/ttpci/av7110_ipack.c
diff --git a/drivers/media/dvb/ttpci/av7110_ipack.h b/drivers/media/pci/ttpci/av7110_ipack.h
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_ipack.h
rename to drivers/media/pci/ttpci/av7110_ipack.h
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_ir.c
rename to drivers/media/pci/ttpci/av7110_ir.c
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/pci/ttpci/av7110_v4l.c
similarity index 100%
rename from drivers/media/dvb/ttpci/av7110_v4l.c
rename to drivers/media/pci/ttpci/av7110_v4l.c
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/pci/ttpci/budget-av.c
similarity index 100%
rename from drivers/media/dvb/ttpci/budget-av.c
rename to drivers/media/pci/ttpci/budget-av.c
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/pci/ttpci/budget-ci.c
similarity index 100%
rename from drivers/media/dvb/ttpci/budget-ci.c
rename to drivers/media/pci/ttpci/budget-ci.c
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/pci/ttpci/budget-core.c
similarity index 100%
rename from drivers/media/dvb/ttpci/budget-core.c
rename to drivers/media/pci/ttpci/budget-core.c
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/pci/ttpci/budget-patch.c
similarity index 100%
rename from drivers/media/dvb/ttpci/budget-patch.c
rename to drivers/media/pci/ttpci/budget-patch.c
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/pci/ttpci/budget.c
similarity index 100%
rename from drivers/media/dvb/ttpci/budget.c
rename to drivers/media/pci/ttpci/budget.c
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/pci/ttpci/budget.h
similarity index 100%
rename from drivers/media/dvb/ttpci/budget.h
rename to drivers/media/pci/ttpci/budget.h
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/pci/ttpci/ttpci-eeprom.c
similarity index 100%
rename from drivers/media/dvb/ttpci/ttpci-eeprom.c
rename to drivers/media/pci/ttpci/ttpci-eeprom.c
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.h b/drivers/media/pci/ttpci/ttpci-eeprom.h
similarity index 100%
rename from drivers/media/dvb/ttpci/ttpci-eeprom.h
rename to drivers/media/pci/ttpci/ttpci-eeprom.h
diff --git a/drivers/media/usb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile
index 23de51d..1dafb8d 100644
--- a/drivers/media/usb/dvb-usb/Makefile
+++ b/drivers/media/usb/dvb-usb/Makefile
@@ -117,5 +117,5 @@ ccflags-y += -I$(srctree)/drivers/media/dvb-core
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
+ccflags-y += -I$(srctree)/drivers/media/pci/ttpci
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 07/10] [media] b2c2: break it into common/pci/usb directories
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (5 preceding siblings ...)
2012-06-14 20:35 ` [PATCH RFC 06/10] [media] Rename media/dvb as media/pci Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 08/10] [media] common: move media/common/tuners to media/tuners Mauro Carvalho Chehab
` (3 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
b2c2 is, in fact, 2 drivers: one for PCI and one for USB, plus
a common bus-independent code. Break it accordingly.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/Kconfig | 4 +-
drivers/media/common/Kconfig | 2 +
drivers/media/common/Makefile | 2 +-
drivers/media/common/b2c2/Kconfig | 31 ++++++++++++++++
drivers/media/common/b2c2/Makefile | 7 ++++
.../media/{pci => common}/b2c2/flexcop-common.h | 0
.../media/{pci => common}/b2c2/flexcop-eeprom.c | 0
.../media/{pci => common}/b2c2/flexcop-fe-tuner.c | 0
.../media/{pci => common}/b2c2/flexcop-hw-filter.c | 0
drivers/media/{pci => common}/b2c2/flexcop-i2c.c | 0
drivers/media/{pci => common}/b2c2/flexcop-misc.c | 0
drivers/media/{pci => common}/b2c2/flexcop-reg.h | 0
drivers/media/{pci => common}/b2c2/flexcop-sram.c | 0
drivers/media/{pci => common}/b2c2/flexcop.c | 0
drivers/media/{pci => common}/b2c2/flexcop.h | 0
.../{pci => common}/b2c2/flexcop_ibi_value_be.h | 0
.../{pci => common}/b2c2/flexcop_ibi_value_le.h | 0
drivers/media/pci/Kconfig | 21 +++--------
drivers/media/pci/Makefile | 3 +-
drivers/media/pci/b2c2/Kconfig | 39 --------------------
drivers/media/pci/b2c2/Makefile | 13 ++-----
drivers/media/usb/Kconfig | 1 +
drivers/media/usb/Makefile | 2 +-
drivers/media/usb/b2c2/Kconfig | 6 +++
drivers/media/usb/b2c2/Makefile | 7 ++++
drivers/media/{pci => usb}/b2c2/flexcop-usb.c | 0
drivers/media/{pci => usb}/b2c2/flexcop-usb.h | 0
27 files changed, 71 insertions(+), 67 deletions(-)
create mode 100644 drivers/media/common/b2c2/Kconfig
create mode 100644 drivers/media/common/b2c2/Makefile
rename drivers/media/{pci => common}/b2c2/flexcop-common.h (100%)
rename drivers/media/{pci => common}/b2c2/flexcop-eeprom.c (100%)
rename drivers/media/{pci => common}/b2c2/flexcop-fe-tuner.c (100%)
rename drivers/media/{pci => common}/b2c2/flexcop-hw-filter.c (100%)
rename drivers/media/{pci => common}/b2c2/flexcop-i2c.c (100%)
rename drivers/media/{pci => common}/b2c2/flexcop-misc.c (100%)
rename drivers/media/{pci => common}/b2c2/flexcop-reg.h (100%)
rename drivers/media/{pci => common}/b2c2/flexcop-sram.c (100%)
rename drivers/media/{pci => common}/b2c2/flexcop.c (100%)
rename drivers/media/{pci => common}/b2c2/flexcop.h (100%)
rename drivers/media/{pci => common}/b2c2/flexcop_ibi_value_be.h (100%)
rename drivers/media/{pci => common}/b2c2/flexcop_ibi_value_le.h (100%)
create mode 100644 drivers/media/usb/b2c2/Kconfig
create mode 100644 drivers/media/usb/b2c2/Makefile
rename drivers/media/{pci => usb}/b2c2/flexcop-usb.c (100%)
rename drivers/media/{pci => usb}/b2c2/flexcop-usb.h (100%)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index bd415c4..efc3055 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -141,7 +141,6 @@ config DVB_NET
You may want to disable the network support on embedded devices. If
unsure say Y.
-source "drivers/media/common/Kconfig"
source "drivers/media/rc/Kconfig"
#
@@ -175,4 +174,7 @@ comment "Supported DVB Frontends"
depends on DVB_CORE
source "drivers/media/dvb-frontends/Kconfig"
+# Common drivers
+source "drivers/media/common/Kconfig"
+
endif # MEDIA_SUPPORT
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 769c6f8..4672f7d 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -7,3 +7,5 @@ config VIDEO_SAA7146_VV
depends on VIDEO_V4L2
select VIDEOBUF_DMA_SG
select VIDEO_SAA7146
+
+source "drivers/media/common/b2c2/Kconfig"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index e3ec963..d0512d7 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,6 +1,6 @@
saa7146-objs := saa7146_i2c.o saa7146_core.o
saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-obj-y += tuners/
+obj-y += tuners/ b2c2/
obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff --git a/drivers/media/common/b2c2/Kconfig b/drivers/media/common/b2c2/Kconfig
new file mode 100644
index 0000000..e270dd8
--- /dev/null
+++ b/drivers/media/common/b2c2/Kconfig
@@ -0,0 +1,31 @@
+config DVB_B2C2_FLEXCOP
+ tristate
+ depends on DVB_CORE && I2C
+ depends on DVB_B2C2_FLEXCOP_PCI || DVB_B2C2_FLEXCOP_USB
+ default y
+ select DVB_PLL if !DVB_FE_CUSTOMISE
+ select DVB_STV0299 if !DVB_FE_CUSTOMISE
+ select DVB_MT352 if !DVB_FE_CUSTOMISE
+ select DVB_MT312 if !DVB_FE_CUSTOMISE
+ select DVB_NXT200X if !DVB_FE_CUSTOMISE
+ select DVB_STV0297 if !DVB_FE_CUSTOMISE
+ select DVB_BCM3510 if !DVB_FE_CUSTOMISE
+ select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+ select DVB_S5H1420 if !DVB_FE_CUSTOMISE
+ select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
+ select DVB_ISL6421 if !DVB_FE_CUSTOMISE
+ select DVB_CX24123 if !DVB_FE_CUSTOMISE
+ select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
+ select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
+ help
+ Support for the digital TV receiver chip made by B2C2 Inc. included in
+ Technisats PCI cards and USB boxes.
+
+ Say Y if you own such a device and want to use it.
+
+config DVB_B2C2_FLEXCOP_DEBUG
+ bool "Enable debug for the B2C2 FlexCop drivers"
+ depends on DVB_B2C2_FLEXCOP
+ help
+ Say Y if you want to enable the module option to control debug messages
+ of all B2C2 FlexCop drivers.
diff --git a/drivers/media/common/b2c2/Makefile b/drivers/media/common/b2c2/Makefile
new file mode 100644
index 0000000..377d051
--- /dev/null
+++ b/drivers/media/common/b2c2/Makefile
@@ -0,0 +1,7 @@
+b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
+ flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o
+obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
+
+ccflags-y += -Idrivers/media/dvb-core/
+ccflags-y += -Idrivers/media/dvb-frontends/
+ccflags-y += -Idrivers/media/common/tuners/
diff --git a/drivers/media/pci/b2c2/flexcop-common.h b/drivers/media/common/b2c2/flexcop-common.h
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-common.h
rename to drivers/media/common/b2c2/flexcop-common.h
diff --git a/drivers/media/pci/b2c2/flexcop-eeprom.c b/drivers/media/common/b2c2/flexcop-eeprom.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-eeprom.c
rename to drivers/media/common/b2c2/flexcop-eeprom.c
diff --git a/drivers/media/pci/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-fe-tuner.c
rename to drivers/media/common/b2c2/flexcop-fe-tuner.c
diff --git a/drivers/media/pci/b2c2/flexcop-hw-filter.c b/drivers/media/common/b2c2/flexcop-hw-filter.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-hw-filter.c
rename to drivers/media/common/b2c2/flexcop-hw-filter.c
diff --git a/drivers/media/pci/b2c2/flexcop-i2c.c b/drivers/media/common/b2c2/flexcop-i2c.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-i2c.c
rename to drivers/media/common/b2c2/flexcop-i2c.c
diff --git a/drivers/media/pci/b2c2/flexcop-misc.c b/drivers/media/common/b2c2/flexcop-misc.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-misc.c
rename to drivers/media/common/b2c2/flexcop-misc.c
diff --git a/drivers/media/pci/b2c2/flexcop-reg.h b/drivers/media/common/b2c2/flexcop-reg.h
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-reg.h
rename to drivers/media/common/b2c2/flexcop-reg.h
diff --git a/drivers/media/pci/b2c2/flexcop-sram.c b/drivers/media/common/b2c2/flexcop-sram.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-sram.c
rename to drivers/media/common/b2c2/flexcop-sram.c
diff --git a/drivers/media/pci/b2c2/flexcop.c b/drivers/media/common/b2c2/flexcop.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop.c
rename to drivers/media/common/b2c2/flexcop.c
diff --git a/drivers/media/pci/b2c2/flexcop.h b/drivers/media/common/b2c2/flexcop.h
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop.h
rename to drivers/media/common/b2c2/flexcop.h
diff --git a/drivers/media/pci/b2c2/flexcop_ibi_value_be.h b/drivers/media/common/b2c2/flexcop_ibi_value_be.h
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop_ibi_value_be.h
rename to drivers/media/common/b2c2/flexcop_ibi_value_be.h
diff --git a/drivers/media/pci/b2c2/flexcop_ibi_value_le.h b/drivers/media/common/b2c2/flexcop_ibi_value_le.h
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop_ibi_value_le.h
rename to drivers/media/common/b2c2/flexcop_ibi_value_le.h
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index 3b9164a..b16529b 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -3,48 +3,39 @@
#
menuconfig DVB_CAPTURE_DRIVERS
- bool "DVB/ATSC adapters"
+ 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
+if DVB_CAPTURE_DRIVERS && DVB_CORE && PCI && I2C
comment "Supported SAA7146 based PCI Adapters"
- depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/ttpci/Kconfig"
-comment "Supported FlexCopII (B2C2) Adapters"
- depends on DVB_CORE && (PCI || USB) && I2C
+comment "Supported FlexCopII (B2C2) PCI Adapters"
source "drivers/media/pci/b2c2/Kconfig"
comment "Supported BT878 Adapters"
- depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/bt8xx/Kconfig"
comment "Supported Pluto2 Adapters"
- depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/pluto2/Kconfig"
comment "Supported SDMC DM1105 Adapters"
- depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/dm1105/Kconfig"
comment "Supported Earthsoft PT1 Adapters"
- depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/pt1/Kconfig"
comment "Supported Mantis Adapters"
- depends on DVB_CORE && PCI && I2C
- source "drivers/media/pci/mantis/Kconfig"
+source "drivers/media/pci/mantis/Kconfig"
comment "Supported nGene Adapters"
- depends on DVB_CORE && PCI && I2C
- source "drivers/media/pci/ngene/Kconfig"
+source "drivers/media/pci/ngene/Kconfig"
comment "Supported ddbridge ('Octopus') Adapters"
- depends on DVB_CORE && PCI && I2C
- source "drivers/media/pci/ddbridge/Kconfig"
+source "drivers/media/pci/ddbridge/Kconfig"
endif # DVB_CAPTURE_DRIVERS
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index c5fa43a..1d44fbd 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -10,4 +10,5 @@ obj-y := ttpci/ \
pt1/ \
mantis/ \
ngene/ \
- ddbridge/
+ ddbridge/ \
+ b2c2/
diff --git a/drivers/media/pci/b2c2/Kconfig b/drivers/media/pci/b2c2/Kconfig
index 9e57814..aaa1f30 100644
--- a/drivers/media/pci/b2c2/Kconfig
+++ b/drivers/media/pci/b2c2/Kconfig
@@ -1,45 +1,6 @@
-config DVB_B2C2_FLEXCOP
- tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
- depends on DVB_CORE && I2C
- select DVB_PLL if !DVB_FE_CUSTOMISE
- select DVB_STV0299 if !DVB_FE_CUSTOMISE
- select DVB_MT352 if !DVB_FE_CUSTOMISE
- select DVB_MT312 if !DVB_FE_CUSTOMISE
- select DVB_NXT200X if !DVB_FE_CUSTOMISE
- select DVB_STV0297 if !DVB_FE_CUSTOMISE
- select DVB_BCM3510 if !DVB_FE_CUSTOMISE
- select DVB_LGDT330X if !DVB_FE_CUSTOMISE
- select DVB_S5H1420 if !DVB_FE_CUSTOMISE
- select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
- select DVB_ISL6421 if !DVB_FE_CUSTOMISE
- select DVB_CX24123 if !DVB_FE_CUSTOMISE
- select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
- select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
- help
- Support for the digital TV receiver chip made by B2C2 Inc. included in
- Technisats PCI cards and USB boxes.
-
- Say Y if you own such a device and want to use it.
-
config DVB_B2C2_FLEXCOP_PCI
tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
- depends on DVB_B2C2_FLEXCOP && PCI && I2C
help
Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.
Say Y if you own such a device and want to use it.
-
-config DVB_B2C2_FLEXCOP_USB
- tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
- depends on DVB_B2C2_FLEXCOP && USB && I2C
- help
- Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
-
- Say Y if you own such a device and want to use it.
-
-config DVB_B2C2_FLEXCOP_DEBUG
- bool "Enable debug for the B2C2 FlexCop drivers"
- depends on DVB_B2C2_FLEXCOP
- help
- Say Y if you want to enable the module option to control debug messages
- of all B2C2 FlexCop drivers.
diff --git a/drivers/media/pci/b2c2/Makefile b/drivers/media/pci/b2c2/Makefile
index 7a1f5ce..e90e236 100644
--- a/drivers/media/pci/b2c2/Makefile
+++ b/drivers/media/pci/b2c2/Makefile
@@ -1,16 +1,11 @@
-b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
- flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o
-obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
-
ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)
-b2c2-flexcop-objs += flexcop-dma.o
+b2c2-flexcop-pci-objs += flexcop-dma.o
endif
b2c2-flexcop-pci-objs = flexcop-pci.o
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/
+ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -Idrivers/media/common/b2c2/
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index d8891ad..b6f348a 100644
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -13,5 +13,6 @@ source "drivers/media/usb/dvb-usb/Kconfig"
source "drivers/media/usb/ttusb-budget/Kconfig"
source "drivers/media/usb/ttusb-dec/Kconfig"
source "drivers/media/usb/siano/Kconfig"
+source "drivers/media/usb/b2c2/Kconfig"
endif
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index b6c2229..669c48f 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -3,4 +3,4 @@
#
# DVB USB-only drivers
-obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ siano/
+obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ siano/ b2c2/
diff --git a/drivers/media/usb/b2c2/Kconfig b/drivers/media/usb/b2c2/Kconfig
new file mode 100644
index 0000000..3af7c41
--- /dev/null
+++ b/drivers/media/usb/b2c2/Kconfig
@@ -0,0 +1,6 @@
+config DVB_B2C2_FLEXCOP_USB
+ tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
+ help
+ Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
+
+ Say Y if you own such a device and want to use it.
diff --git a/drivers/media/usb/b2c2/Makefile b/drivers/media/usb/b2c2/Makefile
new file mode 100644
index 0000000..9eaf208
--- /dev/null
+++ b/drivers/media/usb/b2c2/Makefile
@@ -0,0 +1,7 @@
+b2c2-flexcop-usb-objs = flexcop-usb.o
+obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
+
+ccflags-y += -Idrivers/media/dvb-core/
+ccflags-y += -Idrivers/media/dvb-frontends/
+ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -Idrivers/media/common/b2c2/
diff --git a/drivers/media/pci/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-usb.c
rename to drivers/media/usb/b2c2/flexcop-usb.c
diff --git a/drivers/media/pci/b2c2/flexcop-usb.h b/drivers/media/usb/b2c2/flexcop-usb.h
similarity index 100%
rename from drivers/media/pci/b2c2/flexcop-usb.h
rename to drivers/media/usb/b2c2/flexcop-usb.h
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 08/10] [media] common: move media/common/tuners to media/tuners
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (6 preceding siblings ...)
2012-06-14 20:35 ` [PATCH RFC 07/10] [media] b2c2: break it into common/pci/usb directories Mauro Carvalho Chehab
@ 2012-06-14 20:35 ` Mauro Carvalho Chehab
2012-06-14 20:36 ` [PATCH RFC 09/10] [media] saa7146: Move it to its own directory Mauro Carvalho Chehab
` (2 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:35 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
Move the tuners one level up, as the "common" directory will be used
by drivers that are shared between more than one driver.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
MAINTAINERS | 4 ++--
drivers/media/Kconfig | 2 +-
drivers/media/Makefile | 2 +-
drivers/media/common/Makefile | 2 +-
drivers/media/common/b2c2/Makefile | 2 +-
drivers/media/dvb-frontends/Makefile | 2 +-
drivers/media/pci/bt8xx/Makefile | 2 +-
drivers/media/pci/ddbridge/Makefile | 2 +-
drivers/media/pci/ngene/Makefile | 2 +-
drivers/media/pci/ttpci/Makefile | 2 +-
drivers/media/{common => }/tuners/Kconfig | 0
drivers/media/{common => }/tuners/Makefile | 0
drivers/media/{common => }/tuners/fc0011.c | 0
drivers/media/{common => }/tuners/fc0011.h | 0
drivers/media/{common => }/tuners/fc0012-priv.h | 0
drivers/media/{common => }/tuners/fc0012.c | 0
drivers/media/{common => }/tuners/fc0012.h | 0
drivers/media/{common => }/tuners/fc0013-priv.h | 0
drivers/media/{common => }/tuners/fc0013.c | 0
drivers/media/{common => }/tuners/fc0013.h | 0
drivers/media/{common => }/tuners/fc001x-common.h | 0
drivers/media/{common => }/tuners/max2165.c | 0
drivers/media/{common => }/tuners/max2165.h | 0
drivers/media/{common => }/tuners/max2165_priv.h | 0
drivers/media/{common => }/tuners/mc44s803.c | 0
drivers/media/{common => }/tuners/mc44s803.h | 0
drivers/media/{common => }/tuners/mc44s803_priv.h | 0
drivers/media/{common => }/tuners/mt2060.c | 0
drivers/media/{common => }/tuners/mt2060.h | 0
drivers/media/{common => }/tuners/mt2060_priv.h | 0
drivers/media/{common => }/tuners/mt2063.c | 0
drivers/media/{common => }/tuners/mt2063.h | 0
drivers/media/{common => }/tuners/mt20xx.c | 0
drivers/media/{common => }/tuners/mt20xx.h | 0
drivers/media/{common => }/tuners/mt2131.c | 0
drivers/media/{common => }/tuners/mt2131.h | 0
drivers/media/{common => }/tuners/mt2131_priv.h | 0
drivers/media/{common => }/tuners/mt2266.c | 0
drivers/media/{common => }/tuners/mt2266.h | 0
drivers/media/{common => }/tuners/mxl5005s.c | 0
drivers/media/{common => }/tuners/mxl5005s.h | 0
drivers/media/{common => }/tuners/mxl5007t.c | 0
drivers/media/{common => }/tuners/mxl5007t.h | 0
drivers/media/{common => }/tuners/qt1010.c | 0
drivers/media/{common => }/tuners/qt1010.h | 0
drivers/media/{common => }/tuners/qt1010_priv.h | 0
drivers/media/{common => }/tuners/tda18212.c | 0
drivers/media/{common => }/tuners/tda18212.h | 0
drivers/media/{common => }/tuners/tda18218.c | 0
drivers/media/{common => }/tuners/tda18218.h | 0
drivers/media/{common => }/tuners/tda18218_priv.h | 0
drivers/media/{common => }/tuners/tda18271-common.c | 0
drivers/media/{common => }/tuners/tda18271-fe.c | 0
drivers/media/{common => }/tuners/tda18271-maps.c | 0
drivers/media/{common => }/tuners/tda18271-priv.h | 0
drivers/media/{common => }/tuners/tda18271.h | 0
drivers/media/{common => }/tuners/tda827x.c | 0
drivers/media/{common => }/tuners/tda827x.h | 0
drivers/media/{common => }/tuners/tda8290.c | 0
drivers/media/{common => }/tuners/tda8290.h | 0
drivers/media/{common => }/tuners/tda9887.c | 0
drivers/media/{common => }/tuners/tda9887.h | 0
drivers/media/{common => }/tuners/tea5761.c | 0
drivers/media/{common => }/tuners/tea5761.h | 0
drivers/media/{common => }/tuners/tea5767.c | 0
drivers/media/{common => }/tuners/tea5767.h | 0
drivers/media/{common => }/tuners/tua9001.c | 0
drivers/media/{common => }/tuners/tua9001.h | 0
drivers/media/{common => }/tuners/tua9001_priv.h | 0
drivers/media/{common => }/tuners/tuner-i2c.h | 0
drivers/media/{common => }/tuners/tuner-simple.c | 0
drivers/media/{common => }/tuners/tuner-simple.h | 0
drivers/media/{common => }/tuners/tuner-types.c | 0
drivers/media/{common => }/tuners/tuner-xc2028-types.h | 0
drivers/media/{common => }/tuners/tuner-xc2028.c | 0
drivers/media/{common => }/tuners/tuner-xc2028.h | 0
drivers/media/{common => }/tuners/xc4000.c | 0
drivers/media/{common => }/tuners/xc4000.h | 0
drivers/media/{common => }/tuners/xc5000.c | 0
drivers/media/{common => }/tuners/xc5000.h | 0
drivers/media/usb/b2c2/Makefile | 2 +-
drivers/media/usb/dvb-usb/Makefile | 2 +-
drivers/media/v4l2-core/Makefile | 2 +-
drivers/media/video/Makefile | 2 +-
drivers/media/video/au0828/Makefile | 2 +-
drivers/media/video/bt8xx/Makefile | 2 +-
drivers/media/video/cx18/Makefile | 2 +-
drivers/media/video/cx231xx/Makefile | 2 +-
drivers/media/video/cx23885/Makefile | 2 +-
drivers/media/video/cx25821/Makefile | 2 +-
drivers/media/video/cx88/Makefile | 2 +-
drivers/media/video/em28xx/Makefile | 2 +-
drivers/media/video/ivtv/Makefile | 2 +-
drivers/media/video/pvrusb2/Makefile | 2 +-
drivers/media/video/saa7134/Makefile | 2 +-
drivers/media/video/saa7164/Makefile | 2 +-
drivers/media/video/tlg2300/Makefile | 2 +-
drivers/media/video/tm6000/Makefile | 2 +-
drivers/media/video/usbvision/Makefile | 2 +-
drivers/staging/media/cxd2099/Makefile | 2 +-
100 files changed, 31 insertions(+), 31 deletions(-)
rename drivers/media/{common => }/tuners/Kconfig (100%)
rename drivers/media/{common => }/tuners/Makefile (100%)
rename drivers/media/{common => }/tuners/fc0011.c (100%)
rename drivers/media/{common => }/tuners/fc0011.h (100%)
rename drivers/media/{common => }/tuners/fc0012-priv.h (100%)
rename drivers/media/{common => }/tuners/fc0012.c (100%)
rename drivers/media/{common => }/tuners/fc0012.h (100%)
rename drivers/media/{common => }/tuners/fc0013-priv.h (100%)
rename drivers/media/{common => }/tuners/fc0013.c (100%)
rename drivers/media/{common => }/tuners/fc0013.h (100%)
rename drivers/media/{common => }/tuners/fc001x-common.h (100%)
rename drivers/media/{common => }/tuners/max2165.c (100%)
rename drivers/media/{common => }/tuners/max2165.h (100%)
rename drivers/media/{common => }/tuners/max2165_priv.h (100%)
rename drivers/media/{common => }/tuners/mc44s803.c (100%)
rename drivers/media/{common => }/tuners/mc44s803.h (100%)
rename drivers/media/{common => }/tuners/mc44s803_priv.h (100%)
rename drivers/media/{common => }/tuners/mt2060.c (100%)
rename drivers/media/{common => }/tuners/mt2060.h (100%)
rename drivers/media/{common => }/tuners/mt2060_priv.h (100%)
rename drivers/media/{common => }/tuners/mt2063.c (100%)
rename drivers/media/{common => }/tuners/mt2063.h (100%)
rename drivers/media/{common => }/tuners/mt20xx.c (100%)
rename drivers/media/{common => }/tuners/mt20xx.h (100%)
rename drivers/media/{common => }/tuners/mt2131.c (100%)
rename drivers/media/{common => }/tuners/mt2131.h (100%)
rename drivers/media/{common => }/tuners/mt2131_priv.h (100%)
rename drivers/media/{common => }/tuners/mt2266.c (100%)
rename drivers/media/{common => }/tuners/mt2266.h (100%)
rename drivers/media/{common => }/tuners/mxl5005s.c (100%)
rename drivers/media/{common => }/tuners/mxl5005s.h (100%)
rename drivers/media/{common => }/tuners/mxl5007t.c (100%)
rename drivers/media/{common => }/tuners/mxl5007t.h (100%)
rename drivers/media/{common => }/tuners/qt1010.c (100%)
rename drivers/media/{common => }/tuners/qt1010.h (100%)
rename drivers/media/{common => }/tuners/qt1010_priv.h (100%)
rename drivers/media/{common => }/tuners/tda18212.c (100%)
rename drivers/media/{common => }/tuners/tda18212.h (100%)
rename drivers/media/{common => }/tuners/tda18218.c (100%)
rename drivers/media/{common => }/tuners/tda18218.h (100%)
rename drivers/media/{common => }/tuners/tda18218_priv.h (100%)
rename drivers/media/{common => }/tuners/tda18271-common.c (100%)
rename drivers/media/{common => }/tuners/tda18271-fe.c (100%)
rename drivers/media/{common => }/tuners/tda18271-maps.c (100%)
rename drivers/media/{common => }/tuners/tda18271-priv.h (100%)
rename drivers/media/{common => }/tuners/tda18271.h (100%)
rename drivers/media/{common => }/tuners/tda827x.c (100%)
rename drivers/media/{common => }/tuners/tda827x.h (100%)
rename drivers/media/{common => }/tuners/tda8290.c (100%)
rename drivers/media/{common => }/tuners/tda8290.h (100%)
rename drivers/media/{common => }/tuners/tda9887.c (100%)
rename drivers/media/{common => }/tuners/tda9887.h (100%)
rename drivers/media/{common => }/tuners/tea5761.c (100%)
rename drivers/media/{common => }/tuners/tea5761.h (100%)
rename drivers/media/{common => }/tuners/tea5767.c (100%)
rename drivers/media/{common => }/tuners/tea5767.h (100%)
rename drivers/media/{common => }/tuners/tua9001.c (100%)
rename drivers/media/{common => }/tuners/tua9001.h (100%)
rename drivers/media/{common => }/tuners/tua9001_priv.h (100%)
rename drivers/media/{common => }/tuners/tuner-i2c.h (100%)
rename drivers/media/{common => }/tuners/tuner-simple.c (100%)
rename drivers/media/{common => }/tuners/tuner-simple.h (100%)
rename drivers/media/{common => }/tuners/tuner-types.c (100%)
rename drivers/media/{common => }/tuners/tuner-xc2028-types.h (100%)
rename drivers/media/{common => }/tuners/tuner-xc2028.c (100%)
rename drivers/media/{common => }/tuners/tuner-xc2028.h (100%)
rename drivers/media/{common => }/tuners/xc4000.c (100%)
rename drivers/media/{common => }/tuners/xc4000.h (100%)
rename drivers/media/{common => }/tuners/xc5000.c (100%)
rename drivers/media/{common => }/tuners/xc5000.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index f175f44..4f37a4c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2699,8 +2699,8 @@ FC0011 TUNER DRIVER
M: Michael Buesch <m@bues.ch>
L: linux-media@vger.kernel.org
S: Maintained
-F: drivers/media/common/tuners/fc0011.h
-F: drivers/media/common/tuners/fc0011.c
+F: drivers/media/tuners/fc0011.h
+F: drivers/media/tuners/fc0011.c
FANOTIFY
M: Eric Paris <eparis@redhat.com>
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index efc3055..7b079a4 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -147,7 +147,7 @@ source "drivers/media/rc/Kconfig"
# Tuner drivers for DVB and V4L
#
-source "drivers/media/common/tuners/Kconfig"
+source "drivers/media/tuners/Kconfig"
#
# Video/Radio/Hybrid adapters
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 90ec998..f89ccac 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
obj-$(CONFIG_MEDIA_SUPPORT) += media.o
endif
-obj-y += v4l2-core/ common/ rc/ video/
+obj-y += v4l2-core/ tuners/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index d0512d7..a471242 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,6 +1,6 @@
saa7146-objs := saa7146_i2c.o saa7146_core.o
saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-obj-y += tuners/ b2c2/
+obj-y += b2c2/
obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff --git a/drivers/media/common/b2c2/Makefile b/drivers/media/common/b2c2/Makefile
index 377d051..48a4c90 100644
--- a/drivers/media/common/b2c2/Makefile
+++ b/drivers/media/common/b2c2/Makefile
@@ -4,4 +4,4 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -Idrivers/media/tuners/
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
index 28671c2..3c8e39b 100644
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -3,7 +3,7 @@
#
ccflags-y += -I$(srctree)/drivers/media/dvb-core/
-ccflags-y += -I$(srctree)/drivers/media/common/tuners/
+ccflags-y += -I$(srctree)/drivers/media/tuners/
stb0899-objs = stb0899_drv.o stb0899_algo.o
stv0900-objs = stv0900_core.o stv0900_sw.o
diff --git a/drivers/media/pci/bt8xx/Makefile b/drivers/media/pci/bt8xx/Makefile
index 36591ae..c008d0c 100644
--- a/drivers/media/pci/bt8xx/Makefile
+++ b/drivers/media/pci/bt8xx/Makefile
@@ -3,4 +3,4 @@ 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/video/bt8xx
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
diff --git a/drivers/media/pci/ddbridge/Makefile b/drivers/media/pci/ddbridge/Makefile
index 9d083c9..7446c8b 100644
--- a/drivers/media/pci/ddbridge/Makefile
+++ b/drivers/media/pci/ddbridge/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -Idrivers/media/tuners/
# For the staging CI driver cxd2099
ccflags-y += -Idrivers/staging/media/cxd2099/
diff --git a/drivers/media/pci/ngene/Makefile b/drivers/media/pci/ngene/Makefile
index 6399708..5c0b5d6 100644
--- a/drivers/media/pci/ngene/Makefile
+++ b/drivers/media/pci/ngene/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_DVB_NGENE) += ngene.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -Idrivers/media/tuners/
# For the staging CI driver cxd2099
ccflags-y += -Idrivers/staging/media/cxd2099/
diff --git a/drivers/media/pci/ttpci/Makefile b/drivers/media/pci/ttpci/Makefile
index 22a235f..9890596 100644
--- a/drivers/media/pci/ttpci/Makefile
+++ b/drivers/media/pci/ttpci/Makefile
@@ -18,4 +18,4 @@ 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/common/tuners
+ccflags-y += -Idrivers/media/tuners
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/tuners/Kconfig
similarity index 100%
rename from drivers/media/common/tuners/Kconfig
rename to drivers/media/tuners/Kconfig
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/tuners/Makefile
similarity index 100%
rename from drivers/media/common/tuners/Makefile
rename to drivers/media/tuners/Makefile
diff --git a/drivers/media/common/tuners/fc0011.c b/drivers/media/tuners/fc0011.c
similarity index 100%
rename from drivers/media/common/tuners/fc0011.c
rename to drivers/media/tuners/fc0011.c
diff --git a/drivers/media/common/tuners/fc0011.h b/drivers/media/tuners/fc0011.h
similarity index 100%
rename from drivers/media/common/tuners/fc0011.h
rename to drivers/media/tuners/fc0011.h
diff --git a/drivers/media/common/tuners/fc0012-priv.h b/drivers/media/tuners/fc0012-priv.h
similarity index 100%
rename from drivers/media/common/tuners/fc0012-priv.h
rename to drivers/media/tuners/fc0012-priv.h
diff --git a/drivers/media/common/tuners/fc0012.c b/drivers/media/tuners/fc0012.c
similarity index 100%
rename from drivers/media/common/tuners/fc0012.c
rename to drivers/media/tuners/fc0012.c
diff --git a/drivers/media/common/tuners/fc0012.h b/drivers/media/tuners/fc0012.h
similarity index 100%
rename from drivers/media/common/tuners/fc0012.h
rename to drivers/media/tuners/fc0012.h
diff --git a/drivers/media/common/tuners/fc0013-priv.h b/drivers/media/tuners/fc0013-priv.h
similarity index 100%
rename from drivers/media/common/tuners/fc0013-priv.h
rename to drivers/media/tuners/fc0013-priv.h
diff --git a/drivers/media/common/tuners/fc0013.c b/drivers/media/tuners/fc0013.c
similarity index 100%
rename from drivers/media/common/tuners/fc0013.c
rename to drivers/media/tuners/fc0013.c
diff --git a/drivers/media/common/tuners/fc0013.h b/drivers/media/tuners/fc0013.h
similarity index 100%
rename from drivers/media/common/tuners/fc0013.h
rename to drivers/media/tuners/fc0013.h
diff --git a/drivers/media/common/tuners/fc001x-common.h b/drivers/media/tuners/fc001x-common.h
similarity index 100%
rename from drivers/media/common/tuners/fc001x-common.h
rename to drivers/media/tuners/fc001x-common.h
diff --git a/drivers/media/common/tuners/max2165.c b/drivers/media/tuners/max2165.c
similarity index 100%
rename from drivers/media/common/tuners/max2165.c
rename to drivers/media/tuners/max2165.c
diff --git a/drivers/media/common/tuners/max2165.h b/drivers/media/tuners/max2165.h
similarity index 100%
rename from drivers/media/common/tuners/max2165.h
rename to drivers/media/tuners/max2165.h
diff --git a/drivers/media/common/tuners/max2165_priv.h b/drivers/media/tuners/max2165_priv.h
similarity index 100%
rename from drivers/media/common/tuners/max2165_priv.h
rename to drivers/media/tuners/max2165_priv.h
diff --git a/drivers/media/common/tuners/mc44s803.c b/drivers/media/tuners/mc44s803.c
similarity index 100%
rename from drivers/media/common/tuners/mc44s803.c
rename to drivers/media/tuners/mc44s803.c
diff --git a/drivers/media/common/tuners/mc44s803.h b/drivers/media/tuners/mc44s803.h
similarity index 100%
rename from drivers/media/common/tuners/mc44s803.h
rename to drivers/media/tuners/mc44s803.h
diff --git a/drivers/media/common/tuners/mc44s803_priv.h b/drivers/media/tuners/mc44s803_priv.h
similarity index 100%
rename from drivers/media/common/tuners/mc44s803_priv.h
rename to drivers/media/tuners/mc44s803_priv.h
diff --git a/drivers/media/common/tuners/mt2060.c b/drivers/media/tuners/mt2060.c
similarity index 100%
rename from drivers/media/common/tuners/mt2060.c
rename to drivers/media/tuners/mt2060.c
diff --git a/drivers/media/common/tuners/mt2060.h b/drivers/media/tuners/mt2060.h
similarity index 100%
rename from drivers/media/common/tuners/mt2060.h
rename to drivers/media/tuners/mt2060.h
diff --git a/drivers/media/common/tuners/mt2060_priv.h b/drivers/media/tuners/mt2060_priv.h
similarity index 100%
rename from drivers/media/common/tuners/mt2060_priv.h
rename to drivers/media/tuners/mt2060_priv.h
diff --git a/drivers/media/common/tuners/mt2063.c b/drivers/media/tuners/mt2063.c
similarity index 100%
rename from drivers/media/common/tuners/mt2063.c
rename to drivers/media/tuners/mt2063.c
diff --git a/drivers/media/common/tuners/mt2063.h b/drivers/media/tuners/mt2063.h
similarity index 100%
rename from drivers/media/common/tuners/mt2063.h
rename to drivers/media/tuners/mt2063.h
diff --git a/drivers/media/common/tuners/mt20xx.c b/drivers/media/tuners/mt20xx.c
similarity index 100%
rename from drivers/media/common/tuners/mt20xx.c
rename to drivers/media/tuners/mt20xx.c
diff --git a/drivers/media/common/tuners/mt20xx.h b/drivers/media/tuners/mt20xx.h
similarity index 100%
rename from drivers/media/common/tuners/mt20xx.h
rename to drivers/media/tuners/mt20xx.h
diff --git a/drivers/media/common/tuners/mt2131.c b/drivers/media/tuners/mt2131.c
similarity index 100%
rename from drivers/media/common/tuners/mt2131.c
rename to drivers/media/tuners/mt2131.c
diff --git a/drivers/media/common/tuners/mt2131.h b/drivers/media/tuners/mt2131.h
similarity index 100%
rename from drivers/media/common/tuners/mt2131.h
rename to drivers/media/tuners/mt2131.h
diff --git a/drivers/media/common/tuners/mt2131_priv.h b/drivers/media/tuners/mt2131_priv.h
similarity index 100%
rename from drivers/media/common/tuners/mt2131_priv.h
rename to drivers/media/tuners/mt2131_priv.h
diff --git a/drivers/media/common/tuners/mt2266.c b/drivers/media/tuners/mt2266.c
similarity index 100%
rename from drivers/media/common/tuners/mt2266.c
rename to drivers/media/tuners/mt2266.c
diff --git a/drivers/media/common/tuners/mt2266.h b/drivers/media/tuners/mt2266.h
similarity index 100%
rename from drivers/media/common/tuners/mt2266.h
rename to drivers/media/tuners/mt2266.h
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/tuners/mxl5005s.c
similarity index 100%
rename from drivers/media/common/tuners/mxl5005s.c
rename to drivers/media/tuners/mxl5005s.c
diff --git a/drivers/media/common/tuners/mxl5005s.h b/drivers/media/tuners/mxl5005s.h
similarity index 100%
rename from drivers/media/common/tuners/mxl5005s.h
rename to drivers/media/tuners/mxl5005s.h
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/tuners/mxl5007t.c
similarity index 100%
rename from drivers/media/common/tuners/mxl5007t.c
rename to drivers/media/tuners/mxl5007t.c
diff --git a/drivers/media/common/tuners/mxl5007t.h b/drivers/media/tuners/mxl5007t.h
similarity index 100%
rename from drivers/media/common/tuners/mxl5007t.h
rename to drivers/media/tuners/mxl5007t.h
diff --git a/drivers/media/common/tuners/qt1010.c b/drivers/media/tuners/qt1010.c
similarity index 100%
rename from drivers/media/common/tuners/qt1010.c
rename to drivers/media/tuners/qt1010.c
diff --git a/drivers/media/common/tuners/qt1010.h b/drivers/media/tuners/qt1010.h
similarity index 100%
rename from drivers/media/common/tuners/qt1010.h
rename to drivers/media/tuners/qt1010.h
diff --git a/drivers/media/common/tuners/qt1010_priv.h b/drivers/media/tuners/qt1010_priv.h
similarity index 100%
rename from drivers/media/common/tuners/qt1010_priv.h
rename to drivers/media/tuners/qt1010_priv.h
diff --git a/drivers/media/common/tuners/tda18212.c b/drivers/media/tuners/tda18212.c
similarity index 100%
rename from drivers/media/common/tuners/tda18212.c
rename to drivers/media/tuners/tda18212.c
diff --git a/drivers/media/common/tuners/tda18212.h b/drivers/media/tuners/tda18212.h
similarity index 100%
rename from drivers/media/common/tuners/tda18212.h
rename to drivers/media/tuners/tda18212.h
diff --git a/drivers/media/common/tuners/tda18218.c b/drivers/media/tuners/tda18218.c
similarity index 100%
rename from drivers/media/common/tuners/tda18218.c
rename to drivers/media/tuners/tda18218.c
diff --git a/drivers/media/common/tuners/tda18218.h b/drivers/media/tuners/tda18218.h
similarity index 100%
rename from drivers/media/common/tuners/tda18218.h
rename to drivers/media/tuners/tda18218.h
diff --git a/drivers/media/common/tuners/tda18218_priv.h b/drivers/media/tuners/tda18218_priv.h
similarity index 100%
rename from drivers/media/common/tuners/tda18218_priv.h
rename to drivers/media/tuners/tda18218_priv.h
diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/tuners/tda18271-common.c
similarity index 100%
rename from drivers/media/common/tuners/tda18271-common.c
rename to drivers/media/tuners/tda18271-common.c
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/tuners/tda18271-fe.c
similarity index 100%
rename from drivers/media/common/tuners/tda18271-fe.c
rename to drivers/media/tuners/tda18271-fe.c
diff --git a/drivers/media/common/tuners/tda18271-maps.c b/drivers/media/tuners/tda18271-maps.c
similarity index 100%
rename from drivers/media/common/tuners/tda18271-maps.c
rename to drivers/media/tuners/tda18271-maps.c
diff --git a/drivers/media/common/tuners/tda18271-priv.h b/drivers/media/tuners/tda18271-priv.h
similarity index 100%
rename from drivers/media/common/tuners/tda18271-priv.h
rename to drivers/media/tuners/tda18271-priv.h
diff --git a/drivers/media/common/tuners/tda18271.h b/drivers/media/tuners/tda18271.h
similarity index 100%
rename from drivers/media/common/tuners/tda18271.h
rename to drivers/media/tuners/tda18271.h
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/tuners/tda827x.c
similarity index 100%
rename from drivers/media/common/tuners/tda827x.c
rename to drivers/media/tuners/tda827x.c
diff --git a/drivers/media/common/tuners/tda827x.h b/drivers/media/tuners/tda827x.h
similarity index 100%
rename from drivers/media/common/tuners/tda827x.h
rename to drivers/media/tuners/tda827x.h
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
similarity index 100%
rename from drivers/media/common/tuners/tda8290.c
rename to drivers/media/tuners/tda8290.c
diff --git a/drivers/media/common/tuners/tda8290.h b/drivers/media/tuners/tda8290.h
similarity index 100%
rename from drivers/media/common/tuners/tda8290.h
rename to drivers/media/tuners/tda8290.h
diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/tuners/tda9887.c
similarity index 100%
rename from drivers/media/common/tuners/tda9887.c
rename to drivers/media/tuners/tda9887.c
diff --git a/drivers/media/common/tuners/tda9887.h b/drivers/media/tuners/tda9887.h
similarity index 100%
rename from drivers/media/common/tuners/tda9887.h
rename to drivers/media/tuners/tda9887.h
diff --git a/drivers/media/common/tuners/tea5761.c b/drivers/media/tuners/tea5761.c
similarity index 100%
rename from drivers/media/common/tuners/tea5761.c
rename to drivers/media/tuners/tea5761.c
diff --git a/drivers/media/common/tuners/tea5761.h b/drivers/media/tuners/tea5761.h
similarity index 100%
rename from drivers/media/common/tuners/tea5761.h
rename to drivers/media/tuners/tea5761.h
diff --git a/drivers/media/common/tuners/tea5767.c b/drivers/media/tuners/tea5767.c
similarity index 100%
rename from drivers/media/common/tuners/tea5767.c
rename to drivers/media/tuners/tea5767.c
diff --git a/drivers/media/common/tuners/tea5767.h b/drivers/media/tuners/tea5767.h
similarity index 100%
rename from drivers/media/common/tuners/tea5767.h
rename to drivers/media/tuners/tea5767.h
diff --git a/drivers/media/common/tuners/tua9001.c b/drivers/media/tuners/tua9001.c
similarity index 100%
rename from drivers/media/common/tuners/tua9001.c
rename to drivers/media/tuners/tua9001.c
diff --git a/drivers/media/common/tuners/tua9001.h b/drivers/media/tuners/tua9001.h
similarity index 100%
rename from drivers/media/common/tuners/tua9001.h
rename to drivers/media/tuners/tua9001.h
diff --git a/drivers/media/common/tuners/tua9001_priv.h b/drivers/media/tuners/tua9001_priv.h
similarity index 100%
rename from drivers/media/common/tuners/tua9001_priv.h
rename to drivers/media/tuners/tua9001_priv.h
diff --git a/drivers/media/common/tuners/tuner-i2c.h b/drivers/media/tuners/tuner-i2c.h
similarity index 100%
rename from drivers/media/common/tuners/tuner-i2c.h
rename to drivers/media/tuners/tuner-i2c.h
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/tuners/tuner-simple.c
similarity index 100%
rename from drivers/media/common/tuners/tuner-simple.c
rename to drivers/media/tuners/tuner-simple.c
diff --git a/drivers/media/common/tuners/tuner-simple.h b/drivers/media/tuners/tuner-simple.h
similarity index 100%
rename from drivers/media/common/tuners/tuner-simple.h
rename to drivers/media/tuners/tuner-simple.h
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/tuners/tuner-types.c
similarity index 100%
rename from drivers/media/common/tuners/tuner-types.c
rename to drivers/media/tuners/tuner-types.c
diff --git a/drivers/media/common/tuners/tuner-xc2028-types.h b/drivers/media/tuners/tuner-xc2028-types.h
similarity index 100%
rename from drivers/media/common/tuners/tuner-xc2028-types.h
rename to drivers/media/tuners/tuner-xc2028-types.h
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
similarity index 100%
rename from drivers/media/common/tuners/tuner-xc2028.c
rename to drivers/media/tuners/tuner-xc2028.c
diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/tuners/tuner-xc2028.h
similarity index 100%
rename from drivers/media/common/tuners/tuner-xc2028.h
rename to drivers/media/tuners/tuner-xc2028.h
diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/tuners/xc4000.c
similarity index 100%
rename from drivers/media/common/tuners/xc4000.c
rename to drivers/media/tuners/xc4000.c
diff --git a/drivers/media/common/tuners/xc4000.h b/drivers/media/tuners/xc4000.h
similarity index 100%
rename from drivers/media/common/tuners/xc4000.h
rename to drivers/media/tuners/xc4000.h
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/tuners/xc5000.c
similarity index 100%
rename from drivers/media/common/tuners/xc5000.c
rename to drivers/media/tuners/xc5000.c
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/tuners/xc5000.h
similarity index 100%
rename from drivers/media/common/tuners/xc5000.h
rename to drivers/media/tuners/xc5000.h
diff --git a/drivers/media/usb/b2c2/Makefile b/drivers/media/usb/b2c2/Makefile
index 9eaf208..2f7ee5c 100644
--- a/drivers/media/usb/b2c2/Makefile
+++ b/drivers/media/usb/b2c2/Makefile
@@ -3,5 +3,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -Idrivers/media/tuners/
ccflags-y += -Idrivers/media/common/b2c2/
diff --git a/drivers/media/usb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile
index 1dafb8d..1d3b497 100644
--- a/drivers/media/usb/dvb-usb/Makefile
+++ b/drivers/media/usb/dvb-usb/Makefile
@@ -116,6 +116,6 @@ 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/
# due to tuner-xc3028
-ccflags-y += -I$(srctree)/drivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/tuners
ccflags-y += -I$(srctree)/drivers/media/pci/ttpci
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index 74b65ea..c0e90bc 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -31,5 +31,5 @@ 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/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/tuners
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 17d729d..fb096de 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -187,4 +187,4 @@ 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/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/tuners
diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/video/au0828/Makefile
index 61b69e6..98cc20c 100644
--- a/drivers/media/video/au0828/Makefile
+++ b/drivers/media/video/au0828/Makefile
@@ -2,7 +2,7 @@ au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-vid
obj-$(CONFIG_VIDEO_AU0828) += au0828.o
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
index 4cba4ef..f6351a2 100644
--- a/drivers/media/video/bt8xx/Makefile
+++ b/drivers/media/video/bt8xx/Makefile
@@ -9,5 +9,5 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \
obj-$(CONFIG_VIDEO_BT848) += bttv.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile
index db5ab12..d3ff154 100644
--- a/drivers/media/video/cx18/Makefile
+++ b/drivers/media/video/cx18/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
index fe5706d..b774a7c 100644
--- a/drivers/media/video/cx231xx/Makefile
+++ b/drivers/media/video/cx231xx/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o
obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
ccflags-y += -Idrivers/media/usb/dvb-usb
diff --git a/drivers/media/video/cx23885/Makefile b/drivers/media/video/cx23885/Makefile
index 8f82e01..f92cc4c 100644
--- a/drivers/media/video/cx23885/Makefile
+++ b/drivers/media/video/cx23885/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/cx25821/Makefile b/drivers/media/video/cx25821/Makefile
index af23e0c..1434e80 100644
--- a/drivers/media/video/cx25821/Makefile
+++ b/drivers/media/video/cx25821/Makefile
@@ -8,6 +8,6 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
ccflags-y := -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
index 5c4d306..884b4cd 100644
--- a/drivers/media/video/cx88/Makefile
+++ b/drivers/media/video/cx88/Makefile
@@ -11,6 +11,6 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
index f4118d2..65c7c29 100644
--- a/drivers/media/video/em28xx/Makefile
+++ b/drivers/media/video/em28xx/Makefile
@@ -10,6 +10,6 @@ obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o
obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile
index 0015bd4..80b4ec1 100644
--- a/drivers/media/video/ivtv/Makefile
+++ b/drivers/media/video/ivtv/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_VIDEO_IVTV) += ivtv.o
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/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile
index 1458797..bc716db 100644
--- a/drivers/media/video/pvrusb2/Makefile
+++ b/drivers/media/video/pvrusb2/Makefile
@@ -17,6 +17,6 @@ pvrusb2-objs := pvrusb2-i2c-core.o \
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 7af78a8..aba5008 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -11,6 +11,6 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
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/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
diff --git a/drivers/media/video/saa7164/Makefile b/drivers/media/video/saa7164/Makefile
index d8ed33d..847110c 100644
--- a/drivers/media/video/saa7164/Makefile
+++ b/drivers/media/video/saa7164/Makefile
@@ -5,7 +5,7 @@ saa7164-objs := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \
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/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
diff --git a/drivers/media/video/tlg2300/Makefile b/drivers/media/video/tlg2300/Makefile
index 268d825..4d66087 100644
--- a/drivers/media/video/tlg2300/Makefile
+++ b/drivers/media/video/tlg2300/Makefile
@@ -3,7 +3,7 @@ poseidon-objs := pd-video.o pd-alsa.o pd-dvb.o pd-radio.o pd-main.o
obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/tm6000/Makefile b/drivers/media/video/tm6000/Makefile
index 56cbcba..1feb8c9 100644
--- a/drivers/media/video/tm6000/Makefile
+++ b/drivers/media/video/tm6000/Makefile
@@ -10,6 +10,6 @@ obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
ccflags-y := -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/video/usbvision/Makefile b/drivers/media/video/usbvision/Makefile
index aea1e3b..d55c6bd 100644
--- a/drivers/media/video/usbvision/Makefile
+++ b/drivers/media/video/usbvision/Makefile
@@ -3,4 +3,4 @@ usbvision-objs := usbvision-core.o usbvision-video.o usbvision-i2c.o usbvision-
obj-$(CONFIG_VIDEO_USBVISION) += usbvision.o
ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/tuners
diff --git a/drivers/staging/media/cxd2099/Makefile b/drivers/staging/media/cxd2099/Makefile
index eb6bc59..b2905e6 100644
--- a/drivers/staging/media/cxd2099/Makefile
+++ b/drivers/staging/media/cxd2099/Makefile
@@ -2,4 +2,4 @@ obj-$(CONFIG_DVB_CXD2099) += cxd2099.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -Idrivers/media/tuners/
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 09/10] [media] saa7146: Move it to its own directory
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (7 preceding siblings ...)
2012-06-14 20:35 ` [PATCH RFC 08/10] [media] common: move media/common/tuners to media/tuners Mauro Carvalho Chehab
@ 2012-06-14 20:36 ` Mauro Carvalho Chehab
2012-06-14 20:36 ` [PATCH RFC 10/10] [media] break siano into mmc and usb directories Mauro Carvalho Chehab
2012-06-15 7:39 ` [PATCH RFC 00/10] media file tree reorg - part 1 Hans Verkuil
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:36 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
In order to better organize the directory tree, move the
saa7146 common driver to its own directory.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/common/Kconfig | 11 +----------
drivers/media/common/Makefile | 7 +------
drivers/media/common/saa7146/Kconfig | 9 +++++++++
drivers/media/common/saa7146/Makefile | 5 +++++
drivers/media/common/{ => saa7146}/saa7146_core.c | 0
drivers/media/common/{ => saa7146}/saa7146_fops.c | 0
drivers/media/common/{ => saa7146}/saa7146_hlp.c | 0
drivers/media/common/{ => saa7146}/saa7146_i2c.c | 0
drivers/media/common/{ => saa7146}/saa7146_vbi.c | 0
drivers/media/common/{ => saa7146}/saa7146_video.c | 0
10 files changed, 16 insertions(+), 16 deletions(-)
create mode 100644 drivers/media/common/saa7146/Kconfig
create mode 100644 drivers/media/common/saa7146/Makefile
rename drivers/media/common/{ => saa7146}/saa7146_core.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_fops.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_hlp.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_i2c.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_vbi.c (100%)
rename drivers/media/common/{ => saa7146}/saa7146_video.c (100%)
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 4672f7d..157f191 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -1,11 +1,2 @@
-config VIDEO_SAA7146
- tristate
- depends on I2C && PCI
-
-config VIDEO_SAA7146_VV
- tristate
- depends on VIDEO_V4L2
- select VIDEOBUF_DMA_SG
- select VIDEO_SAA7146
-
source "drivers/media/common/b2c2/Kconfig"
+source "drivers/media/common/saa7146/Kconfig"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index a471242..f3afd83 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,6 +1 @@
-saa7146-objs := saa7146_i2c.o saa7146_core.o
-saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-
-obj-y += b2c2/
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
-obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
+obj-y += b2c2/ saa7146/
diff --git a/drivers/media/common/saa7146/Kconfig b/drivers/media/common/saa7146/Kconfig
new file mode 100644
index 0000000..769c6f8
--- /dev/null
+++ b/drivers/media/common/saa7146/Kconfig
@@ -0,0 +1,9 @@
+config VIDEO_SAA7146
+ tristate
+ depends on I2C && PCI
+
+config VIDEO_SAA7146_VV
+ tristate
+ depends on VIDEO_V4L2
+ select VIDEOBUF_DMA_SG
+ select VIDEO_SAA7146
diff --git a/drivers/media/common/saa7146/Makefile b/drivers/media/common/saa7146/Makefile
new file mode 100644
index 0000000..3219b00
--- /dev/null
+++ b/drivers/media/common/saa7146/Makefile
@@ -0,0 +1,5 @@
+saa7146-objs := saa7146_i2c.o saa7146_core.o
+saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
+
+obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
+obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
similarity index 100%
rename from drivers/media/common/saa7146_core.c
rename to drivers/media/common/saa7146/saa7146_core.c
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
similarity index 100%
rename from drivers/media/common/saa7146_fops.c
rename to drivers/media/common/saa7146/saa7146_fops.c
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c
similarity index 100%
rename from drivers/media/common/saa7146_hlp.c
rename to drivers/media/common/saa7146/saa7146_hlp.c
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146/saa7146_i2c.c
similarity index 100%
rename from drivers/media/common/saa7146_i2c.c
rename to drivers/media/common/saa7146/saa7146_i2c.c
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c
similarity index 100%
rename from drivers/media/common/saa7146_vbi.c
rename to drivers/media/common/saa7146/saa7146_vbi.c
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c
similarity index 100%
rename from drivers/media/common/saa7146_video.c
rename to drivers/media/common/saa7146/saa7146_video.c
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RFC 10/10] [media] break siano into mmc and usb directories
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (8 preceding siblings ...)
2012-06-14 20:36 ` [PATCH RFC 09/10] [media] saa7146: Move it to its own directory Mauro Carvalho Chehab
@ 2012-06-14 20:36 ` Mauro Carvalho Chehab
2012-06-15 7:39 ` [PATCH RFC 00/10] media file tree reorg - part 1 Hans Verkuil
10 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-14 20:36 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List
siano is, in fact, 2 drivers: one for MMC and one for USB, plus
a common bus-independent code. Break it accordingly.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/Kconfig | 1 +
drivers/media/Makefile | 2 +-
drivers/media/common/Kconfig | 1 +
drivers/media/common/Makefile | 2 +-
drivers/media/common/siano/Kconfig | 17 ++++++++++++++
drivers/media/common/siano/Makefile | 7 ++++++
drivers/media/{usb => common}/siano/sms-cards.c | 0
drivers/media/{usb => common}/siano/sms-cards.h | 0
drivers/media/{usb => common}/siano/smscoreapi.c | 0
drivers/media/{usb => common}/siano/smscoreapi.h | 0
drivers/media/{usb => common}/siano/smsdvb.c | 0
drivers/media/{usb => common}/siano/smsendian.c | 0
drivers/media/{usb => common}/siano/smsendian.h | 0
drivers/media/{usb => common}/siano/smsir.c | 0
drivers/media/{usb => common}/siano/smsir.h | 0
drivers/media/mmc/Kconfig | 1 +
drivers/media/mmc/Makefile | 1 +
drivers/media/mmc/siano/Kconfig | 10 +++++++++
drivers/media/mmc/siano/Makefile | 6 +++++
drivers/media/{usb => mmc}/siano/smssdio.c | 0
drivers/media/usb/siano/Kconfig | 26 +---------------------
drivers/media/usb/siano/Makefile | 7 +-----
22 files changed, 48 insertions(+), 33 deletions(-)
create mode 100644 drivers/media/common/siano/Kconfig
create mode 100644 drivers/media/common/siano/Makefile
rename drivers/media/{usb => common}/siano/sms-cards.c (100%)
rename drivers/media/{usb => common}/siano/sms-cards.h (100%)
rename drivers/media/{usb => common}/siano/smscoreapi.c (100%)
rename drivers/media/{usb => common}/siano/smscoreapi.h (100%)
rename drivers/media/{usb => common}/siano/smsdvb.c (100%)
rename drivers/media/{usb => common}/siano/smsendian.c (100%)
rename drivers/media/{usb => common}/siano/smsendian.h (100%)
rename drivers/media/{usb => common}/siano/smsir.c (100%)
rename drivers/media/{usb => common}/siano/smsir.h (100%)
create mode 100644 drivers/media/mmc/Kconfig
create mode 100644 drivers/media/mmc/Makefile
create mode 100644 drivers/media/mmc/siano/Kconfig
create mode 100644 drivers/media/mmc/siano/Makefile
rename drivers/media/{usb => mmc}/siano/smssdio.c (100%)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 7b079a4..d892d48 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -165,6 +165,7 @@ source "drivers/media/radio/Kconfig"
source "drivers/media/dvb-core/Kconfig"
source "drivers/media/pci/Kconfig"
source "drivers/media/usb/Kconfig"
+source "drivers/media/mmc/Kconfig"
comment "Supported FireWire (IEEE 1394) Adapters"
depends on DVB_CORE && FIREWIRE
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index f89ccac..3265a9a 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -11,5 +11,5 @@ endif
obj-y += v4l2-core/ tuners/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
-obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/
+obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/ mmc/
obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 157f191..121b011 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -1,2 +1,3 @@
source "drivers/media/common/b2c2/Kconfig"
source "drivers/media/common/saa7146/Kconfig"
+source "drivers/media/common/siano/Kconfig"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index f3afd83..b8e2e3a 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1 +1 @@
-obj-y += b2c2/ saa7146/
+obj-y += b2c2/ saa7146/ siano/
diff --git a/drivers/media/common/siano/Kconfig b/drivers/media/common/siano/Kconfig
new file mode 100644
index 0000000..425aead
--- /dev/null
+++ b/drivers/media/common/siano/Kconfig
@@ -0,0 +1,17 @@
+#
+# Siano Mobile Silicon Digital TV device configuration
+#
+
+config SMS_SIANO_MDTV
+ tristate
+ depends on DVB_CORE && RC_CORE && HAS_DMA
+ depends on SMS_USB_DRV || SMS_SDIO_DRV
+ default y
+ ---help---
+ Choose Y or M here if you have MDTV receiver with a Siano chipset.
+
+ To compile this driver as a module, choose M here
+ (The module will be called smsmdtv).
+
+ Further documentation on this driver can be found on the WWW
+ at http://www.siano-ms.com/
diff --git a/drivers/media/common/siano/Makefile b/drivers/media/common/siano/Makefile
new file mode 100644
index 0000000..2a09279
--- /dev/null
+++ b/drivers/media/common/siano/Makefile
@@ -0,0 +1,7 @@
+smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o smsir.o
+
+obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
+
+ccflags-y += -Idrivers/media/dvb-core
+ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+
diff --git a/drivers/media/usb/siano/sms-cards.c b/drivers/media/common/siano/sms-cards.c
similarity index 100%
rename from drivers/media/usb/siano/sms-cards.c
rename to drivers/media/common/siano/sms-cards.c
diff --git a/drivers/media/usb/siano/sms-cards.h b/drivers/media/common/siano/sms-cards.h
similarity index 100%
rename from drivers/media/usb/siano/sms-cards.h
rename to drivers/media/common/siano/sms-cards.h
diff --git a/drivers/media/usb/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
similarity index 100%
rename from drivers/media/usb/siano/smscoreapi.c
rename to drivers/media/common/siano/smscoreapi.c
diff --git a/drivers/media/usb/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h
similarity index 100%
rename from drivers/media/usb/siano/smscoreapi.h
rename to drivers/media/common/siano/smscoreapi.h
diff --git a/drivers/media/usb/siano/smsdvb.c b/drivers/media/common/siano/smsdvb.c
similarity index 100%
rename from drivers/media/usb/siano/smsdvb.c
rename to drivers/media/common/siano/smsdvb.c
diff --git a/drivers/media/usb/siano/smsendian.c b/drivers/media/common/siano/smsendian.c
similarity index 100%
rename from drivers/media/usb/siano/smsendian.c
rename to drivers/media/common/siano/smsendian.c
diff --git a/drivers/media/usb/siano/smsendian.h b/drivers/media/common/siano/smsendian.h
similarity index 100%
rename from drivers/media/usb/siano/smsendian.h
rename to drivers/media/common/siano/smsendian.h
diff --git a/drivers/media/usb/siano/smsir.c b/drivers/media/common/siano/smsir.c
similarity index 100%
rename from drivers/media/usb/siano/smsir.c
rename to drivers/media/common/siano/smsir.c
diff --git a/drivers/media/usb/siano/smsir.h b/drivers/media/common/siano/smsir.h
similarity index 100%
rename from drivers/media/usb/siano/smsir.h
rename to drivers/media/common/siano/smsir.h
diff --git a/drivers/media/mmc/Kconfig b/drivers/media/mmc/Kconfig
new file mode 100644
index 0000000..0f2a957
--- /dev/null
+++ b/drivers/media/mmc/Kconfig
@@ -0,0 +1 @@
+source "drivers/media/mmc/siano/Kconfig"
diff --git a/drivers/media/mmc/Makefile b/drivers/media/mmc/Makefile
new file mode 100644
index 0000000..dacd3cb
--- /dev/null
+++ b/drivers/media/mmc/Makefile
@@ -0,0 +1 @@
+obj-y := siano/
diff --git a/drivers/media/mmc/siano/Kconfig b/drivers/media/mmc/siano/Kconfig
new file mode 100644
index 0000000..fa62475
--- /dev/null
+++ b/drivers/media/mmc/siano/Kconfig
@@ -0,0 +1,10 @@
+#
+# Siano Mobile Silicon Digital TV device configuration
+#
+
+config SMS_SDIO_DRV
+ tristate "Siano SMS1xxx based MDTV via SDIO interface"
+ depends on DVB_CORE && RC_CORE && HAS_DMA
+ depends on MMC
+ ---help---
+ Choose if you would like to have Siano's support for SDIO interface
diff --git a/drivers/media/mmc/siano/Makefile b/drivers/media/mmc/siano/Makefile
new file mode 100644
index 0000000..0e01f97
--- /dev/null
+++ b/drivers/media/mmc/siano/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
+
+ccflags-y += -Idrivers/media/dvb-core
+ccflags-y += -Idrivers/media/common/siano
+ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+
diff --git a/drivers/media/usb/siano/smssdio.c b/drivers/media/mmc/siano/smssdio.c
similarity index 100%
rename from drivers/media/usb/siano/smssdio.c
rename to drivers/media/mmc/siano/smssdio.c
diff --git a/drivers/media/usb/siano/Kconfig b/drivers/media/usb/siano/Kconfig
index bc6456e..3c76e62 100644
--- a/drivers/media/usb/siano/Kconfig
+++ b/drivers/media/usb/siano/Kconfig
@@ -2,33 +2,9 @@
# Siano Mobile Silicon Digital TV device configuration
#
-config SMS_SIANO_MDTV
+config SMS_USB_DRV
tristate "Siano SMS1xxx based MDTV receiver"
depends on DVB_CORE && RC_CORE && HAS_DMA
---help---
- Choose Y or M here if you have MDTV receiver with a Siano chipset.
-
- To compile this driver as a module, choose M here
- (The module will be called smsmdtv).
-
- Further documentation on this driver can be found on the WWW
- at http://www.siano-ms.com/
-
-if SMS_SIANO_MDTV
-menu "Siano module components"
-
-# Hardware interfaces support
-
-config SMS_USB_DRV
- tristate "USB interface support"
- depends on DVB_CORE && USB
- ---help---
Choose if you would like to have Siano's support for USB interface
-config SMS_SDIO_DRV
- tristate "SDIO interface support"
- depends on DVB_CORE && MMC
- ---help---
- Choose if you would like to have Siano's support for SDIO interface
-endmenu
-endif # SMS_SIANO_MDTV
diff --git a/drivers/media/usb/siano/Makefile b/drivers/media/usb/siano/Makefile
index 14756bd..758b6a0 100644
--- a/drivers/media/usb/siano/Makefile
+++ b/drivers/media/usb/siano/Makefile
@@ -1,11 +1,6 @@
-
-smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o smsir.o
-
-obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
obj-$(CONFIG_SMS_USB_DRV) += smsusb.o
-obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
ccflags-y += -Idrivers/media/dvb-core
-
+ccflags-y += -Idrivers/media/common/siano
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
--
1.7.10.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH RFC 00/10] media file tree reorg - part 1
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
` (9 preceding siblings ...)
2012-06-14 20:36 ` [PATCH RFC 10/10] [media] break siano into mmc and usb directories Mauro Carvalho Chehab
@ 2012-06-15 7:39 ` Hans Verkuil
2012-06-15 10:31 ` Mauro Carvalho Chehab
10 siblings, 1 reply; 13+ messages in thread
From: Hans Verkuil @ 2012-06-15 7:39 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: Linux Media Mailing List
On 14/06/12 22:35, Mauro Carvalho Chehab wrote:
> As discussed a while ago, breaking media drivers by V4L or DVB
> is confusing, as:
> - hybrid devices are at V4L drivers;
> - DVB-only devices for chips that support analog are at
> V4L drivers;
> - Analog support addition on a DVB driver would require it
> to move to V4L drivers.
>
> Instead, move all drivers into a per-bus directory, and common drivers
> used by more than one driver into /common.
>
> This is the part 1 of this idea: it moves the core drivers to
> /drivers/media/foo-core, and re-arranges the DVB files.
>
> After this patch series, the directory structure will be:
>
> drivers/media/
> |-- common
> | `--<common drivers>
> |-- dvb-core
> |-- dvb-frontends
> |-- firewire
> |-- mmc
> | `--<mmc/sdio drivers>
> |-- pci
> | `--<pci/pcie drivers>
> |-- radio
> | `--<radio drivers>
> |-- rc
> | `-- keymaps
> |-- tuners
> |-- usb
> | `--<usb drivers>
> |-- v4l2-core
> `-- video
>
> PS.: The "video" directory is currently unchanged. It currently
> contains subdevs, common V4L drivers, and V4L bridges.
>
> On this series, I avoided mixing the file tree reorganization with
> menu improvements. Those will happen together with the second part,
> when the devices under video will be moved to /common, /usb, /pci...
> dirs.
Looks good to me. I like that saa7146 gets its own directory :-)
One request: before you commit this, can you go through the pending
patches for 3.6 and apply all the non-controversial ones? Otherwise
everyone will have to rebase their work.
Regards,
Hans
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC 00/10] media file tree reorg - part 1
2012-06-15 7:39 ` [PATCH RFC 00/10] media file tree reorg - part 1 Hans Verkuil
@ 2012-06-15 10:31 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 13+ messages in thread
From: Mauro Carvalho Chehab @ 2012-06-15 10:31 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List
Em 15-06-2012 04:39, Hans Verkuil escreveu:
> On 14/06/12 22:35, Mauro Carvalho Chehab wrote:
>> As discussed a while ago, breaking media drivers by V4L or DVB
>> is confusing, as:
>> - hybrid devices are at V4L drivers;
>> - DVB-only devices for chips that support analog are at
>> V4L drivers;
>> - Analog support addition on a DVB driver would require it
>> to move to V4L drivers.
>>
>> Instead, move all drivers into a per-bus directory, and common drivers
>> used by more than one driver into /common.
>>
>> This is the part 1 of this idea: it moves the core drivers to
>> /drivers/media/foo-core, and re-arranges the DVB files.
>>
>> After this patch series, the directory structure will be:
>>
>> drivers/media/
>> |-- common
>> | `--<common drivers>
>> |-- dvb-core
>> |-- dvb-frontends
>> |-- firewire
>> |-- mmc
>> | `--<mmc/sdio drivers>
>> |-- pci
>> | `--<pci/pcie drivers>
>> |-- radio
>> | `--<radio drivers>
>> |-- rc
>> | `-- keymaps
>> |-- tuners
>> |-- usb
>> | `--<usb drivers>
>> |-- v4l2-core
>> `-- video
>>
>> PS.: The "video" directory is currently unchanged. It currently
>> contains subdevs, common V4L drivers, and V4L bridges.
>>
>> On this series, I avoided mixing the file tree reorganization with
>> menu improvements. Those will happen together with the second part,
>> when the devices under video will be moved to /common, /usb, /pci...
>> dirs.
>
> Looks good to me. I like that saa7146 gets its own directory :-)
Yes, this is good.
> One request: before you commit this, can you go through the pending patches for 3.6 and apply all the non-controversial ones? Otherwise everyone will have to rebase their work.
Yeah, that's my plan.
> Regards,
>
> Hans
Regards,
Mauro
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-06-15 10:31 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-14 20:35 [PATCH RFC 00/10] media file tree reorg - part 1 Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 01/10] [media] v4l: move v4l2 core into a separate directory Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 02/10] [media] dvb: move the dvb core one level up Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 03/10] [media] move the dvb/frontends to drivers/media/dvb-frontends Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 04/10] [media] firewire: move it one level up Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 05/10] [media] dvb-usb: move it to drivers/media/usb/dvb-usb Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 06/10] [media] Rename media/dvb as media/pci Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 07/10] [media] b2c2: break it into common/pci/usb directories Mauro Carvalho Chehab
2012-06-14 20:35 ` [PATCH RFC 08/10] [media] common: move media/common/tuners to media/tuners Mauro Carvalho Chehab
2012-06-14 20:36 ` [PATCH RFC 09/10] [media] saa7146: Move it to its own directory Mauro Carvalho Chehab
2012-06-14 20:36 ` [PATCH RFC 10/10] [media] break siano into mmc and usb directories Mauro Carvalho Chehab
2012-06-15 7:39 ` [PATCH RFC 00/10] media file tree reorg - part 1 Hans Verkuil
2012-06-15 10:31 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).