diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/usb/Kconfig | 41 | ||||
-rw-r--r-- | drivers/media/usb/Makefile | 14 | ||||
-rw-r--r-- | drivers/media/usb/au0828/Kconfig (renamed from drivers/media/video/au0828/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/Makefile (renamed from drivers/media/video/au0828/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-cards.c (renamed from drivers/media/video/au0828/au0828-cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-cards.h (renamed from drivers/media/video/au0828/au0828-cards.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-core.c (renamed from drivers/media/video/au0828/au0828-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-dvb.c (renamed from drivers/media/video/au0828/au0828-dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-i2c.c (renamed from drivers/media/video/au0828/au0828-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-reg.h (renamed from drivers/media/video/au0828/au0828-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-vbi.c (renamed from drivers/media/video/au0828/au0828-vbi.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-video.c (renamed from drivers/media/video/au0828/au0828-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828.h (renamed from drivers/media/video/au0828/au0828.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cpia2/Kconfig (renamed from drivers/media/video/cpia2/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cpia2/Makefile (renamed from drivers/media/video/cpia2/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cpia2/cpia2.h (renamed from drivers/media/video/cpia2/cpia2.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cpia2/cpia2_core.c (renamed from drivers/media/video/cpia2/cpia2_core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cpia2/cpia2_registers.h (renamed from drivers/media/video/cpia2/cpia2_registers.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cpia2/cpia2_usb.c (renamed from drivers/media/video/cpia2/cpia2_usb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cpia2/cpia2_v4l.c (renamed from drivers/media/video/cpia2/cpia2_v4l.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/Kconfig (renamed from drivers/media/video/cx231xx/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/Makefile (renamed from drivers/media/video/cx231xx/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-417.c (renamed from drivers/media/video/cx231xx/cx231xx-417.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-audio.c (renamed from drivers/media/video/cx231xx/cx231xx-audio.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-avcore.c (renamed from drivers/media/video/cx231xx/cx231xx-avcore.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-cards.c (renamed from drivers/media/video/cx231xx/cx231xx-cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-conf-reg.h (renamed from drivers/media/video/cx231xx/cx231xx-conf-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-core.c (renamed from drivers/media/video/cx231xx/cx231xx-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-dif.h (renamed from drivers/media/video/cx231xx/cx231xx-dif.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-dvb.c (renamed from drivers/media/video/cx231xx/cx231xx-dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-i2c.c (renamed from drivers/media/video/cx231xx/cx231xx-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-input.c (renamed from drivers/media/video/cx231xx/cx231xx-input.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c (renamed from drivers/media/video/cx231xx/cx231xx-pcb-cfg.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h (renamed from drivers/media/video/cx231xx/cx231xx-pcb-cfg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-reg.h (renamed from drivers/media/video/cx231xx/cx231xx-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-vbi.c (renamed from drivers/media/video/cx231xx/cx231xx-vbi.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-vbi.h (renamed from drivers/media/video/cx231xx/cx231xx-vbi.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-video.c (renamed from drivers/media/video/cx231xx/cx231xx-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx.h (renamed from drivers/media/video/cx231xx/cx231xx.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/Kconfig (renamed from drivers/media/video/em28xx/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/Makefile (renamed from drivers/media/video/em28xx/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-audio.c (renamed from drivers/media/video/em28xx/em28xx-audio.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c (renamed from drivers/media/video/em28xx/em28xx-cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-core.c (renamed from drivers/media/video/em28xx/em28xx-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-dvb.c (renamed from drivers/media/video/em28xx/em28xx-dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-i2c.c (renamed from drivers/media/video/em28xx/em28xx-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-input.c (renamed from drivers/media/video/em28xx/em28xx-input.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-reg.h (renamed from drivers/media/video/em28xx/em28xx-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-vbi.c (renamed from drivers/media/video/em28xx/em28xx-vbi.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c (renamed from drivers/media/video/em28xx/em28xx-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx.h (renamed from drivers/media/video/em28xx/em28xx.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/Kconfig (renamed from drivers/media/video/gspca/Kconfig) | 6 | ||||
-rw-r--r-- | drivers/media/usb/gspca/Makefile (renamed from drivers/media/video/gspca/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/autogain_functions.c (renamed from drivers/media/video/gspca/autogain_functions.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/autogain_functions.h (renamed from drivers/media/video/gspca/autogain_functions.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/benq.c (renamed from drivers/media/video/gspca/benq.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/conex.c (renamed from drivers/media/video/gspca/conex.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/cpia1.c (renamed from drivers/media/video/gspca/cpia1.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/etoms.c (renamed from drivers/media/video/gspca/etoms.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/finepix.c (renamed from drivers/media/video/gspca/finepix.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/Kconfig (renamed from drivers/media/video/gspca/gl860/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/Makefile (renamed from drivers/media/video/gspca/gl860/Makefile) | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860-mi1320.c (renamed from drivers/media/video/gspca/gl860/gl860-mi1320.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860-mi2020.c (renamed from drivers/media/video/gspca/gl860/gl860-mi2020.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860-ov2640.c (renamed from drivers/media/video/gspca/gl860/gl860-ov2640.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860-ov9655.c (renamed from drivers/media/video/gspca/gl860/gl860-ov9655.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860.c (renamed from drivers/media/video/gspca/gl860/gl860.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860.h (renamed from drivers/media/video/gspca/gl860/gl860.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gspca.c (renamed from drivers/media/video/gspca/gspca.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gspca.h (renamed from drivers/media/video/gspca/gspca.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/jeilinj.c (renamed from drivers/media/video/gspca/jeilinj.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/jl2005bcd.c (renamed from drivers/media/video/gspca/jl2005bcd.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/jpeg.h (renamed from drivers/media/video/gspca/jpeg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/kinect.c (renamed from drivers/media/video/gspca/kinect.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/konica.c (renamed from drivers/media/video/gspca/konica.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/Kconfig (renamed from drivers/media/video/gspca/m5602/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/Makefile (renamed from drivers/media/video/gspca/m5602/Makefile) | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_bridge.h (renamed from drivers/media/video/gspca/m5602/m5602_bridge.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_core.c (renamed from drivers/media/video/gspca/m5602/m5602_core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_mt9m111.c (renamed from drivers/media/video/gspca/m5602/m5602_mt9m111.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_mt9m111.h (renamed from drivers/media/video/gspca/m5602/m5602_mt9m111.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_ov7660.c (renamed from drivers/media/video/gspca/m5602/m5602_ov7660.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_ov7660.h (renamed from drivers/media/video/gspca/m5602/m5602_ov7660.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_ov9650.c (renamed from drivers/media/video/gspca/m5602/m5602_ov9650.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_ov9650.h (renamed from drivers/media/video/gspca/m5602/m5602_ov9650.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_po1030.c (renamed from drivers/media/video/gspca/m5602/m5602_po1030.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_po1030.h (renamed from drivers/media/video/gspca/m5602/m5602_po1030.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_s5k4aa.c (renamed from drivers/media/video/gspca/m5602/m5602_s5k4aa.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_s5k4aa.h (renamed from drivers/media/video/gspca/m5602/m5602_s5k4aa.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_s5k83a.c (renamed from drivers/media/video/gspca/m5602/m5602_s5k83a.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_s5k83a.h (renamed from drivers/media/video/gspca/m5602/m5602_s5k83a.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_sensor.h (renamed from drivers/media/video/gspca/m5602/m5602_sensor.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/mars.c (renamed from drivers/media/video/gspca/mars.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/mr97310a.c (renamed from drivers/media/video/gspca/mr97310a.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/nw80x.c (renamed from drivers/media/video/gspca/nw80x.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/ov519.c (renamed from drivers/media/video/gspca/ov519.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/ov534.c (renamed from drivers/media/video/gspca/ov534.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/ov534_9.c (renamed from drivers/media/video/gspca/ov534_9.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/pac207.c (renamed from drivers/media/video/gspca/pac207.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/pac7302.c (renamed from drivers/media/video/gspca/pac7302.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/pac7311.c (renamed from drivers/media/video/gspca/pac7311.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/pac_common.h (renamed from drivers/media/video/gspca/pac_common.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/se401.c (renamed from drivers/media/video/gspca/se401.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/se401.h (renamed from drivers/media/video/gspca/se401.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sn9c2028.c (renamed from drivers/media/video/gspca/sn9c2028.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sn9c2028.h (renamed from drivers/media/video/gspca/sn9c2028.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sn9c20x.c (renamed from drivers/media/video/gspca/sn9c20x.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sonixb.c (renamed from drivers/media/video/gspca/sonixb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sonixj.c (renamed from drivers/media/video/gspca/sonixj.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/spca1528.c (renamed from drivers/media/video/gspca/spca1528.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/spca500.c (renamed from drivers/media/video/gspca/spca500.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/spca501.c (renamed from drivers/media/video/gspca/spca501.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/spca505.c (renamed from drivers/media/video/gspca/spca505.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/spca506.c (renamed from drivers/media/video/gspca/spca506.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/spca508.c (renamed from drivers/media/video/gspca/spca508.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/spca561.c (renamed from drivers/media/video/gspca/spca561.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sq905.c (renamed from drivers/media/video/gspca/sq905.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sq905c.c (renamed from drivers/media/video/gspca/sq905c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sq930x.c (renamed from drivers/media/video/gspca/sq930x.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stk014.c (renamed from drivers/media/video/gspca/stk014.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv0680.c (renamed from drivers/media/video/gspca/stv0680.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/Kconfig (renamed from drivers/media/video/gspca/stv06xx/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/Makefile (renamed from drivers/media/video/gspca/stv06xx/Makefile) | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx.c (renamed from drivers/media/video/gspca/stv06xx/stv06xx.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx.h (renamed from drivers/media/video/gspca/stv06xx/stv06xx.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c (renamed from drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.h (renamed from drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c (renamed from drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.h (renamed from drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_sensor.h (renamed from drivers/media/video/gspca/stv06xx/stv06xx_sensor.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c (renamed from drivers/media/video/gspca/stv06xx/stv06xx_st6422.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_st6422.h (renamed from drivers/media/video/gspca/stv06xx/stv06xx_st6422.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c (renamed from drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.h (renamed from drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sunplus.c (renamed from drivers/media/video/gspca/sunplus.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/t613.c (renamed from drivers/media/video/gspca/t613.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/topro.c (renamed from drivers/media/video/gspca/topro.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/tv8532.c (renamed from drivers/media/video/gspca/tv8532.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/vc032x.c (renamed from drivers/media/video/gspca/vc032x.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/vicam.c (renamed from drivers/media/video/gspca/vicam.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/w996Xcf.c (renamed from drivers/media/video/gspca/w996Xcf.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/xirlink_cit.c (renamed from drivers/media/video/gspca/xirlink_cit.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/zc3xx-reg.h (renamed from drivers/media/video/gspca/zc3xx-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/gspca/zc3xx.c (renamed from drivers/media/video/gspca/zc3xx.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/hdpvr/Kconfig (renamed from drivers/media/video/hdpvr/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/hdpvr/Makefile (renamed from drivers/media/video/hdpvr/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-control.c (renamed from drivers/media/video/hdpvr/hdpvr-control.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-core.c (renamed from drivers/media/video/hdpvr/hdpvr-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-i2c.c (renamed from drivers/media/video/hdpvr/hdpvr-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-video.c (renamed from drivers/media/video/hdpvr/hdpvr-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/hdpvr/hdpvr.h (renamed from drivers/media/video/hdpvr/hdpvr.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/Kconfig (renamed from drivers/media/video/pvrusb2/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/Makefile (renamed from drivers/media/video/pvrusb2/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-audio.c (renamed from drivers/media/video/pvrusb2/pvrusb2-audio.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-audio.h (renamed from drivers/media/video/pvrusb2/pvrusb2-audio.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-context.c (renamed from drivers/media/video/pvrusb2/pvrusb2-context.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-context.h (renamed from drivers/media/video/pvrusb2/pvrusb2-context.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c (renamed from drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h (renamed from drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-ctrl.c (renamed from drivers/media/video/pvrusb2/pvrusb2-ctrl.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-ctrl.h (renamed from drivers/media/video/pvrusb2/pvrusb2-ctrl.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c (renamed from drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h (renamed from drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-debug.h (renamed from drivers/media/video/pvrusb2/pvrusb2-debug.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-debugifc.c (renamed from drivers/media/video/pvrusb2/pvrusb2-debugifc.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-debugifc.h (renamed from drivers/media/video/pvrusb2/pvrusb2-debugifc.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-devattr.c (renamed from drivers/media/video/pvrusb2/pvrusb2-devattr.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-devattr.h (renamed from drivers/media/video/pvrusb2/pvrusb2-devattr.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-dvb.c (renamed from drivers/media/video/pvrusb2/pvrusb2-dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-dvb.h (renamed from drivers/media/video/pvrusb2/pvrusb2-dvb.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-eeprom.c (renamed from drivers/media/video/pvrusb2/pvrusb2-eeprom.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-eeprom.h (renamed from drivers/media/video/pvrusb2/pvrusb2-eeprom.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-encoder.c (renamed from drivers/media/video/pvrusb2/pvrusb2-encoder.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-encoder.h (renamed from drivers/media/video/pvrusb2/pvrusb2-encoder.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h (renamed from drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h (renamed from drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-hdw.c (renamed from drivers/media/video/pvrusb2/pvrusb2-hdw.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-hdw.h (renamed from drivers/media/video/pvrusb2/pvrusb2-hdw.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c (renamed from drivers/media/video/pvrusb2/pvrusb2-i2c-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h (renamed from drivers/media/video/pvrusb2/pvrusb2-i2c-core.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-io.c (renamed from drivers/media/video/pvrusb2/pvrusb2-io.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-io.h (renamed from drivers/media/video/pvrusb2/pvrusb2-io.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-ioread.c (renamed from drivers/media/video/pvrusb2/pvrusb2-ioread.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-ioread.h (renamed from drivers/media/video/pvrusb2/pvrusb2-ioread.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-main.c (renamed from drivers/media/video/pvrusb2/pvrusb2-main.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-std.c (renamed from drivers/media/video/pvrusb2/pvrusb2-std.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-std.h (renamed from drivers/media/video/pvrusb2/pvrusb2-std.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-sysfs.c (renamed from drivers/media/video/pvrusb2/pvrusb2-sysfs.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-sysfs.h (renamed from drivers/media/video/pvrusb2/pvrusb2-sysfs.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-util.h (renamed from drivers/media/video/pvrusb2/pvrusb2-util.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-v4l2.c (renamed from drivers/media/video/pvrusb2/pvrusb2-v4l2.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-v4l2.h (renamed from drivers/media/video/pvrusb2/pvrusb2-v4l2.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c (renamed from drivers/media/video/pvrusb2/pvrusb2-video-v4l.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h (renamed from drivers/media/video/pvrusb2/pvrusb2-video-v4l.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-wm8775.c (renamed from drivers/media/video/pvrusb2/pvrusb2-wm8775.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-wm8775.h (renamed from drivers/media/video/pvrusb2/pvrusb2-wm8775.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2.h (renamed from drivers/media/video/pvrusb2/pvrusb2.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/Kconfig (renamed from drivers/media/video/pwc/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/Makefile (renamed from drivers/media/video/pwc/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/philips.txt (renamed from drivers/media/video/pwc/philips.txt) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-ctrl.c (renamed from drivers/media/video/pwc/pwc-ctrl.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-dec1.c (renamed from drivers/media/video/pwc/pwc-dec1.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-dec1.h (renamed from drivers/media/video/pwc/pwc-dec1.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-dec23.c (renamed from drivers/media/video/pwc/pwc-dec23.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-dec23.h (renamed from drivers/media/video/pwc/pwc-dec23.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-if.c (renamed from drivers/media/video/pwc/pwc-if.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-kiara.c (renamed from drivers/media/video/pwc/pwc-kiara.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-kiara.h (renamed from drivers/media/video/pwc/pwc-kiara.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-misc.c (renamed from drivers/media/video/pwc/pwc-misc.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-nala.h (renamed from drivers/media/video/pwc/pwc-nala.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-timon.c (renamed from drivers/media/video/pwc/pwc-timon.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-timon.h (renamed from drivers/media/video/pwc/pwc-timon.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-uncompress.c (renamed from drivers/media/video/pwc/pwc-uncompress.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc-v4l.c (renamed from drivers/media/video/pwc/pwc-v4l.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/pwc/pwc.h (renamed from drivers/media/video/pwc/pwc.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/Kconfig (renamed from drivers/media/video/sn9c102/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/Makefile (renamed from drivers/media/video/sn9c102/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102.h (renamed from drivers/media/video/sn9c102/sn9c102.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_config.h (renamed from drivers/media/video/sn9c102/sn9c102_config.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_core.c (renamed from drivers/media/video/sn9c102/sn9c102_core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_devtable.h (renamed from drivers/media/video/sn9c102/sn9c102_devtable.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_hv7131d.c (renamed from drivers/media/video/sn9c102/sn9c102_hv7131d.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_hv7131r.c (renamed from drivers/media/video/sn9c102/sn9c102_hv7131r.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_mi0343.c (renamed from drivers/media/video/sn9c102/sn9c102_mi0343.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_mi0360.c (renamed from drivers/media/video/sn9c102/sn9c102_mi0360.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_mt9v111.c (renamed from drivers/media/video/sn9c102/sn9c102_mt9v111.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_ov7630.c (renamed from drivers/media/video/sn9c102/sn9c102_ov7630.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_ov7660.c (renamed from drivers/media/video/sn9c102/sn9c102_ov7660.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_pas106b.c (renamed from drivers/media/video/sn9c102/sn9c102_pas106b.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_pas202bcb.c (renamed from drivers/media/video/sn9c102/sn9c102_pas202bcb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_sensor.h (renamed from drivers/media/video/sn9c102/sn9c102_sensor.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_tas5110c1b.c (renamed from drivers/media/video/sn9c102/sn9c102_tas5110c1b.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_tas5110d.c (renamed from drivers/media/video/sn9c102/sn9c102_tas5110d.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/sn9c102/sn9c102_tas5130d1b.c (renamed from drivers/media/video/sn9c102/sn9c102_tas5130d1b.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/Kconfig (renamed from drivers/media/video/stk1160/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/Makefile (renamed from drivers/media/video/stk1160/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-ac97.c (renamed from drivers/media/video/stk1160/stk1160-ac97.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-core.c (renamed from drivers/media/video/stk1160/stk1160-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-i2c.c (renamed from drivers/media/video/stk1160/stk1160-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-reg.h (renamed from drivers/media/video/stk1160/stk1160-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-v4l.c (renamed from drivers/media/video/stk1160/stk1160-v4l.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-video.c (renamed from drivers/media/video/stk1160/stk1160-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/stk1160/stk1160.h (renamed from drivers/media/video/stk1160/stk1160.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/Kconfig (renamed from drivers/media/video/tlg2300/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/Makefile (renamed from drivers/media/video/tlg2300/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/pd-alsa.c (renamed from drivers/media/video/tlg2300/pd-alsa.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/pd-common.h (renamed from drivers/media/video/tlg2300/pd-common.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/pd-dvb.c (renamed from drivers/media/video/tlg2300/pd-dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/pd-main.c (renamed from drivers/media/video/tlg2300/pd-main.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/pd-radio.c (renamed from drivers/media/video/tlg2300/pd-radio.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/pd-video.c (renamed from drivers/media/video/tlg2300/pd-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/vendorcmds.h (renamed from drivers/media/video/tlg2300/vendorcmds.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/Kconfig (renamed from drivers/media/video/tm6000/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/Makefile (renamed from drivers/media/video/tm6000/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-alsa.c (renamed from drivers/media/video/tm6000/tm6000-alsa.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-cards.c (renamed from drivers/media/video/tm6000/tm6000-cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-core.c (renamed from drivers/media/video/tm6000/tm6000-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-dvb.c (renamed from drivers/media/video/tm6000/tm6000-dvb.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-i2c.c (renamed from drivers/media/video/tm6000/tm6000-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-input.c (renamed from drivers/media/video/tm6000/tm6000-input.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-regs.h (renamed from drivers/media/video/tm6000/tm6000-regs.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-stds.c (renamed from drivers/media/video/tm6000/tm6000-stds.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-usb-isoc.h (renamed from drivers/media/video/tm6000/tm6000-usb-isoc.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000-video.c (renamed from drivers/media/video/tm6000/tm6000-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/tm6000.h (renamed from drivers/media/video/tm6000/tm6000.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/Kconfig (renamed from drivers/media/video/usbvision/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/Makefile (renamed from drivers/media/video/usbvision/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/usbvision-cards.c (renamed from drivers/media/video/usbvision/usbvision-cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/usbvision-cards.h (renamed from drivers/media/video/usbvision/usbvision-cards.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/usbvision-core.c (renamed from drivers/media/video/usbvision/usbvision-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/usbvision-i2c.c (renamed from drivers/media/video/usbvision/usbvision-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/usbvision-video.c (renamed from drivers/media/video/usbvision/usbvision-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/usbvision/usbvision.h (renamed from drivers/media/video/usbvision/usbvision.h) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/Kconfig (renamed from drivers/media/video/uvc/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/Makefile (renamed from drivers/media/video/uvc/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_ctrl.c (renamed from drivers/media/video/uvc/uvc_ctrl.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_debugfs.c (renamed from drivers/media/video/uvc/uvc_debugfs.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_driver.c (renamed from drivers/media/video/uvc/uvc_driver.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_entity.c (renamed from drivers/media/video/uvc/uvc_entity.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_isight.c (renamed from drivers/media/video/uvc/uvc_isight.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_queue.c (renamed from drivers/media/video/uvc/uvc_queue.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_status.c (renamed from drivers/media/video/uvc/uvc_status.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_v4l2.c (renamed from drivers/media/video/uvc/uvc_v4l2.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvc_video.c (renamed from drivers/media/video/uvc/uvc_video.c) | 0 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvcvideo.h (renamed from drivers/media/video/uvc/uvcvideo.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/Kconfig | 41 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 16 |
287 files changed, 56 insertions, 68 deletions
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index 53664b3..a1e25ee 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -2,18 +2,49 @@ # USB media device configuration # -menuconfig MEDIA_USB_DRIVERS - bool "Supported DVB USB Adapters" - depends on USB - default y +menu "Media USB Adapters" + visible if USB && MEDIA_SUPPORT -if MEDIA_USB_DRIVERS && DVB_CORE && I2C +if MEDIA_CAMERA_SUPPORT + comment "Webcam devices" +source "drivers/media/usb/uvc/Kconfig" +source "drivers/media/usb/gspca/Kconfig" +source "drivers/media/usb/pwc/Kconfig" +source "drivers/media/usb/cpia2/Kconfig" +source "drivers/media/usb/sn9c102/Kconfig" +endif + +if MEDIA_ANALOG_TV_SUPPORT + comment "Analog TV USB devices" +source "drivers/media/usb/au0828/Kconfig" +source "drivers/media/usb/pvrusb2/Kconfig" +source "drivers/media/usb/hdpvr/Kconfig" +source "drivers/media/usb/tlg2300/Kconfig" +source "drivers/media/usb/usbvision/Kconfig" +source "drivers/media/usb/stk1160/Kconfig" +endif + +if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) + comment "Analog/digital TV USB devices" +source "drivers/media/usb/cx231xx/Kconfig" +source "drivers/media/usb/tm6000/Kconfig" +endif + + +if I2C && MEDIA_DIGITAL_TV_SUPPORT + comment "Digital TV USB devices" source "drivers/media/usb/dvb-usb/Kconfig" source "drivers/media/usb/dvb-usb-v2/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 +if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) + comment "Webcam, TV (analog/digital) USB devices" +source "drivers/media/usb/em28xx/Kconfig" endif + +endmenu diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 6b30ad1..428827a 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile @@ -4,3 +4,17 @@ # DVB USB-only drivers obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/ +obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ +obj-$(CONFIG_USB_GSPCA) += gspca/ +obj-$(CONFIG_USB_PWC) += pwc/ +obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ +obj-$(CONFIG_USB_SN9C102) += sn9c102/ +obj-$(CONFIG_VIDEO_AU0828) += au0828/ +obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ +obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ +obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/ +obj-$(CONFIG_VIDEO_USBVISION) += usbvision/ +obj-$(CONFIG_VIDEO_STK1160) += stk1160/ +obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/ +obj-$(CONFIG_VIDEO_TM6000) += tm6000/ +obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/usb/au0828/Kconfig index 23f7fd2..23f7fd2 100644 --- a/drivers/media/video/au0828/Kconfig +++ b/drivers/media/usb/au0828/Kconfig diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/usb/au0828/Makefile index 98cc20c..98cc20c 100644 --- a/drivers/media/video/au0828/Makefile +++ b/drivers/media/usb/au0828/Makefile diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c index 448361c..448361c 100644 --- a/drivers/media/video/au0828/au0828-cards.c +++ b/drivers/media/usb/au0828/au0828-cards.c diff --git a/drivers/media/video/au0828/au0828-cards.h b/drivers/media/usb/au0828/au0828-cards.h index 48a1882..48a1882 100644 --- a/drivers/media/video/au0828/au0828-cards.h +++ b/drivers/media/usb/au0828/au0828-cards.h diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index 745a80a..745a80a 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index b328f65..b328f65 100644 --- a/drivers/media/video/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c index 4ded17f..4ded17f 100644 --- a/drivers/media/video/au0828/au0828-i2c.c +++ b/drivers/media/usb/au0828/au0828-i2c.c diff --git a/drivers/media/video/au0828/au0828-reg.h b/drivers/media/usb/au0828/au0828-reg.h index 2140f4c..2140f4c 100644 --- a/drivers/media/video/au0828/au0828-reg.h +++ b/drivers/media/usb/au0828/au0828-reg.h diff --git a/drivers/media/video/au0828/au0828-vbi.c b/drivers/media/usb/au0828/au0828-vbi.c index 63f5930..63f5930 100644 --- a/drivers/media/video/au0828/au0828-vbi.c +++ b/drivers/media/usb/au0828/au0828-vbi.c diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c index fa0fa9a..fa0fa9a 100644 --- a/drivers/media/video/au0828/au0828-video.c +++ b/drivers/media/usb/au0828/au0828-video.c diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h index 66a56ef..66a56ef 100644 --- a/drivers/media/video/au0828/au0828.h +++ b/drivers/media/usb/au0828/au0828.h diff --git a/drivers/media/video/cpia2/Kconfig b/drivers/media/usb/cpia2/Kconfig index 66e9283..66e9283 100644 --- a/drivers/media/video/cpia2/Kconfig +++ b/drivers/media/usb/cpia2/Kconfig diff --git a/drivers/media/video/cpia2/Makefile b/drivers/media/usb/cpia2/Makefile index 828cf1b..828cf1b 100644 --- a/drivers/media/video/cpia2/Makefile +++ b/drivers/media/usb/cpia2/Makefile diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/usb/cpia2/cpia2.h index cdef677..cdef677 100644 --- a/drivers/media/video/cpia2/cpia2.h +++ b/drivers/media/usb/cpia2/cpia2.h diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/usb/cpia2/cpia2_core.c index 187012c..187012c 100644 --- a/drivers/media/video/cpia2/cpia2_core.c +++ b/drivers/media/usb/cpia2/cpia2_core.c diff --git a/drivers/media/video/cpia2/cpia2_registers.h b/drivers/media/usb/cpia2/cpia2_registers.h index 3bbec51..3bbec51 100644 --- a/drivers/media/video/cpia2/cpia2_registers.h +++ b/drivers/media/usb/cpia2/cpia2_registers.h diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c index 95b5d6e..95b5d6e 100644 --- a/drivers/media/video/cpia2/cpia2_usb.c +++ b/drivers/media/usb/cpia2/cpia2_usb.c diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c index 5ca6f44..5ca6f44 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/usb/cpia2/cpia2_v4l.c diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig index 446f692..446f692 100644 --- a/drivers/media/video/cx231xx/Kconfig +++ b/drivers/media/usb/cx231xx/Kconfig diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/usb/cx231xx/Makefile index 1d40fce..1d40fce 100644 --- a/drivers/media/video/cx231xx/Makefile +++ b/drivers/media/usb/cx231xx/Makefile diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index b024e51..b024e51 100644 --- a/drivers/media/video/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c index b4c99c7..b4c99c7 100644 --- a/drivers/media/video/cx231xx/cx231xx-audio.c +++ b/drivers/media/usb/cx231xx/cx231xx-audio.c diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c index 447148e..447148e 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 02d4d36..02d4d36 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c diff --git a/drivers/media/video/cx231xx/cx231xx-conf-reg.h b/drivers/media/usb/cx231xx/cx231xx-conf-reg.h index 25593f2..25593f2 100644 --- a/drivers/media/video/cx231xx/cx231xx-conf-reg.h +++ b/drivers/media/usb/cx231xx/cx231xx-conf-reg.h diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c index 05358d4..05358d4 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/usb/cx231xx/cx231xx-core.c diff --git a/drivers/media/video/cx231xx/cx231xx-dif.h b/drivers/media/usb/cx231xx/cx231xx-dif.h index 2b63c2f..2b63c2f 100644 --- a/drivers/media/video/cx231xx/cx231xx-dif.h +++ b/drivers/media/usb/cx231xx/cx231xx-dif.h diff --git a/drivers/media/video/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c index 7c4e360..7c4e360 100644 --- a/drivers/media/video/cx231xx/cx231xx-dvb.c +++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c index 781feed..781feed 100644 --- a/drivers/media/video/cx231xx/cx231xx-i2c.c +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/usb/cx231xx/cx231xx-input.c index 96176e9..96176e9 100644 --- a/drivers/media/video/cx231xx/cx231xx-input.c +++ b/drivers/media/usb/cx231xx/cx231xx-input.c diff --git a/drivers/media/video/cx231xx/cx231xx-pcb-cfg.c b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c index 7473c33..7473c33 100644 --- a/drivers/media/video/cx231xx/cx231xx-pcb-cfg.c +++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c diff --git a/drivers/media/video/cx231xx/cx231xx-pcb-cfg.h b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h index f5e46e8..f5e46e8 100644 --- a/drivers/media/video/cx231xx/cx231xx-pcb-cfg.h +++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h diff --git a/drivers/media/video/cx231xx/cx231xx-reg.h b/drivers/media/usb/cx231xx/cx231xx-reg.h index 750c5d3..750c5d3 100644 --- a/drivers/media/video/cx231xx/cx231xx-reg.h +++ b/drivers/media/usb/cx231xx/cx231xx-reg.h diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.c b/drivers/media/usb/cx231xx/cx231xx-vbi.c index ac7db52..ac7db52 100644 --- a/drivers/media/video/cx231xx/cx231xx-vbi.c +++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.h b/drivers/media/usb/cx231xx/cx231xx-vbi.h index 16c7d20..16c7d20 100644 --- a/drivers/media/video/cx231xx/cx231xx-vbi.h +++ b/drivers/media/usb/cx231xx/cx231xx-vbi.h diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index 790b28d..790b28d 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h index a89d020..a89d020 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/usb/cx231xx/cx231xx.h diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig index 928ef0d..928ef0d 100644 --- a/drivers/media/video/em28xx/Kconfig +++ b/drivers/media/usb/em28xx/Kconfig diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/usb/em28xx/Makefile index 65c7c29..65c7c29 100644 --- a/drivers/media/video/em28xx/Makefile +++ b/drivers/media/usb/em28xx/Makefile diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c index 2fdb66e..2fdb66e 100644 --- a/drivers/media/video/em28xx/em28xx-audio.c +++ b/drivers/media/usb/em28xx/em28xx-audio.c diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index ca62b99..ca62b99 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c index bed07a6..bed07a6 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/usb/em28xx/em28xx-core.c diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c index a16531f..a16531f 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/usb/em28xx/em28xx-dvb.c diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index 1683bd9..1683bd9 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index 97d36b4..97d36b4 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/usb/em28xx/em28xx-input.c diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h index 6ff3682..6ff3682 100644 --- a/drivers/media/video/em28xx/em28xx-reg.h +++ b/drivers/media/usb/em28xx/em28xx-reg.h diff --git a/drivers/media/video/em28xx/em28xx-vbi.c b/drivers/media/usb/em28xx/em28xx-vbi.c index 2b4c9cb..2b4c9cb 100644 --- a/drivers/media/video/em28xx/em28xx-vbi.c +++ b/drivers/media/usb/em28xx/em28xx-vbi.c diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index ecb23df..ecb23df 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 8757523..8757523 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/usb/gspca/Kconfig index dfe268b..6345f93 100644 --- a/drivers/media/video/gspca/Kconfig +++ b/drivers/media/usb/gspca/Kconfig @@ -17,9 +17,9 @@ menuconfig USB_GSPCA if USB_GSPCA && VIDEO_V4L2 -source "drivers/media/video/gspca/m5602/Kconfig" -source "drivers/media/video/gspca/stv06xx/Kconfig" -source "drivers/media/video/gspca/gl860/Kconfig" +source "drivers/media/usb/gspca/m5602/Kconfig" +source "drivers/media/usb/gspca/stv06xx/Kconfig" +source "drivers/media/usb/gspca/gl860/Kconfig" config USB_GSPCA_BENQ tristate "Benq USB Camera Driver" diff --git a/drivers/media/video/gspca/Makefile b/drivers/media/usb/gspca/Makefile index c901da0..c901da0 100644 --- a/drivers/media/video/gspca/Makefile +++ b/drivers/media/usb/gspca/Makefile diff --git a/drivers/media/video/gspca/autogain_functions.c b/drivers/media/usb/gspca/autogain_functions.c index 67db674..67db674 100644 --- a/drivers/media/video/gspca/autogain_functions.c +++ b/drivers/media/usb/gspca/autogain_functions.c diff --git a/drivers/media/video/gspca/autogain_functions.h b/drivers/media/usb/gspca/autogain_functions.h index d625eaf..d625eaf 100644 --- a/drivers/media/video/gspca/autogain_functions.h +++ b/drivers/media/usb/gspca/autogain_functions.h diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/usb/gspca/benq.c index 352f321..352f321 100644 --- a/drivers/media/video/gspca/benq.c +++ b/drivers/media/usb/gspca/benq.c diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/usb/gspca/conex.c index c9052f2..c9052f2 100644 --- a/drivers/media/video/gspca/conex.c +++ b/drivers/media/usb/gspca/conex.c diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c index 2499a88..2499a88 100644 --- a/drivers/media/video/gspca/cpia1.c +++ b/drivers/media/usb/gspca/cpia1.c diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/usb/gspca/etoms.c index 38f68e1..38f68e1 100644 --- a/drivers/media/video/gspca/etoms.c +++ b/drivers/media/usb/gspca/etoms.c diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/usb/gspca/finepix.c index c8f2201..c8f2201 100644 --- a/drivers/media/video/gspca/finepix.c +++ b/drivers/media/usb/gspca/finepix.c diff --git a/drivers/media/video/gspca/gl860/Kconfig b/drivers/media/usb/gspca/gl860/Kconfig index 22772f5..22772f5 100644 --- a/drivers/media/video/gspca/gl860/Kconfig +++ b/drivers/media/usb/gspca/gl860/Kconfig diff --git a/drivers/media/video/gspca/gl860/Makefile b/drivers/media/usb/gspca/gl860/Makefile index 773ea342..cf63974 100644 --- a/drivers/media/video/gspca/gl860/Makefile +++ b/drivers/media/usb/gspca/gl860/Makefile @@ -6,5 +6,5 @@ gspca_gl860-objs := gl860.o \ gl860-ov9655.o \ gl860-mi2020.o -ccflags-y += -I$(srctree)/drivers/media/video/gspca +ccflags-y += -I$(srctree)/drivers/media/usb/gspca diff --git a/drivers/media/video/gspca/gl860/gl860-mi1320.c b/drivers/media/usb/gspca/gl860/gl860-mi1320.c index b57160e..b57160e 100644 --- a/drivers/media/video/gspca/gl860/gl860-mi1320.c +++ b/drivers/media/usb/gspca/gl860/gl860-mi1320.c diff --git a/drivers/media/video/gspca/gl860/gl860-mi2020.c b/drivers/media/usb/gspca/gl860/gl860-mi2020.c index 2edda6b..2edda6b 100644 --- a/drivers/media/video/gspca/gl860/gl860-mi2020.c +++ b/drivers/media/usb/gspca/gl860/gl860-mi2020.c diff --git a/drivers/media/video/gspca/gl860/gl860-ov2640.c b/drivers/media/usb/gspca/gl860/gl860-ov2640.c index 768cac5..768cac5 100644 --- a/drivers/media/video/gspca/gl860/gl860-ov2640.c +++ b/drivers/media/usb/gspca/gl860/gl860-ov2640.c diff --git a/drivers/media/video/gspca/gl860/gl860-ov9655.c b/drivers/media/usb/gspca/gl860/gl860-ov9655.c index 5ae9619..5ae9619 100644 --- a/drivers/media/video/gspca/gl860/gl860-ov9655.c +++ b/drivers/media/usb/gspca/gl860/gl860-ov9655.c diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/usb/gspca/gl860/gl860.c index ced3b71..ced3b71 100644 --- a/drivers/media/video/gspca/gl860/gl860.c +++ b/drivers/media/usb/gspca/gl860/gl860.c diff --git a/drivers/media/video/gspca/gl860/gl860.h b/drivers/media/usb/gspca/gl860/gl860.h index 0330a02..0330a02 100644 --- a/drivers/media/video/gspca/gl860/gl860.h +++ b/drivers/media/usb/gspca/gl860/gl860.h diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index d4e8343..d4e8343 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/usb/gspca/gspca.c diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/usb/gspca/gspca.h index dc688c7..dc688c7 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/usb/gspca/gspca.h diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/usb/gspca/jeilinj.c index 26b9931..26b9931 100644 --- a/drivers/media/video/gspca/jeilinj.c +++ b/drivers/media/usb/gspca/jeilinj.c diff --git a/drivers/media/video/gspca/jl2005bcd.c b/drivers/media/usb/gspca/jl2005bcd.c index cf9d9fc..cf9d9fc 100644 --- a/drivers/media/video/gspca/jl2005bcd.c +++ b/drivers/media/usb/gspca/jl2005bcd.c diff --git a/drivers/media/video/gspca/jpeg.h b/drivers/media/usb/gspca/jpeg.h index ab54910..ab54910 100644 --- a/drivers/media/video/gspca/jpeg.h +++ b/drivers/media/usb/gspca/jpeg.h diff --git a/drivers/media/video/gspca/kinect.c b/drivers/media/usb/gspca/kinect.c index 40ad668..40ad668 100644 --- a/drivers/media/video/gspca/kinect.c +++ b/drivers/media/usb/gspca/kinect.c diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/usb/gspca/konica.c index bbf91e0..bbf91e0 100644 --- a/drivers/media/video/gspca/konica.c +++ b/drivers/media/usb/gspca/konica.c diff --git a/drivers/media/video/gspca/m5602/Kconfig b/drivers/media/usb/gspca/m5602/Kconfig index 5a69016..5a69016 100644 --- a/drivers/media/video/gspca/m5602/Kconfig +++ b/drivers/media/usb/gspca/m5602/Kconfig diff --git a/drivers/media/video/gspca/m5602/Makefile b/drivers/media/usb/gspca/m5602/Makefile index 575b75b..8e1fb5a 100644 --- a/drivers/media/video/gspca/m5602/Makefile +++ b/drivers/media/usb/gspca/m5602/Makefile @@ -8,4 +8,4 @@ gspca_m5602-objs := m5602_core.o \ m5602_s5k83a.o \ m5602_s5k4aa.o -ccflags-y += -I$(srctree)/drivers/media/video/gspca +ccflags-y += -I$(srctree)/drivers/media/usb/gspca diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/usb/gspca/m5602/m5602_bridge.h index 51af3ee..51af3ee 100644 --- a/drivers/media/video/gspca/m5602/m5602_bridge.h +++ b/drivers/media/usb/gspca/m5602/m5602_bridge.h diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/usb/gspca/m5602/m5602_core.c index ed22638..ed22638 100644 --- a/drivers/media/video/gspca/m5602/m5602_core.c +++ b/drivers/media/usb/gspca/m5602/m5602_core.c diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c index 6268aa2..6268aa2 100644 --- a/drivers/media/video/gspca/m5602/m5602_mt9m111.c +++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/usb/gspca/m5602/m5602_mt9m111.h index 8c672b5..8c672b5 100644 --- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h +++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.h diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.c b/drivers/media/usb/gspca/m5602/m5602_ov7660.c index 9a14835..9a14835 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov7660.c +++ b/drivers/media/usb/gspca/m5602/m5602_ov7660.c diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.h b/drivers/media/usb/gspca/m5602/m5602_ov7660.h index 2b6a13b..2b6a13b 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov7660.h +++ b/drivers/media/usb/gspca/m5602/m5602_ov7660.h diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/usb/gspca/m5602/m5602_ov9650.c index 2114a8b..2114a8b 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov9650.c +++ b/drivers/media/usb/gspca/m5602/m5602_ov9650.c diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/usb/gspca/m5602/m5602_ov9650.h index f7aa5bf..f7aa5bf 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov9650.h +++ b/drivers/media/usb/gspca/m5602/m5602_ov9650.h diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.c b/drivers/media/usb/gspca/m5602/m5602_po1030.c index b877169..b877169 100644 --- a/drivers/media/video/gspca/m5602/m5602_po1030.c +++ b/drivers/media/usb/gspca/m5602/m5602_po1030.c diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/usb/gspca/m5602/m5602_po1030.h index 81a2bcb..81a2bcb 100644 --- a/drivers/media/video/gspca/m5602/m5602_po1030.h +++ b/drivers/media/usb/gspca/m5602/m5602_po1030.h diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/usb/gspca/m5602/m5602_s5k4aa.c index cc8ec3f..cc8ec3f 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c +++ b/drivers/media/usb/gspca/m5602/m5602_s5k4aa.c diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/usb/gspca/m5602/m5602_s5k4aa.h index 8e0035e..8e0035e 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h +++ b/drivers/media/usb/gspca/m5602/m5602_s5k4aa.h diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/usb/gspca/m5602/m5602_s5k83a.c index 1de743a..1de743a 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c +++ b/drivers/media/usb/gspca/m5602/m5602_s5k83a.c diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/usb/gspca/m5602/m5602_s5k83a.h index 7995224..7995224 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h +++ b/drivers/media/usb/gspca/m5602/m5602_s5k83a.h diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/usb/gspca/m5602/m5602_sensor.h index edff4f1..edff4f1 100644 --- a/drivers/media/video/gspca/m5602/m5602_sensor.h +++ b/drivers/media/usb/gspca/m5602/m5602_sensor.h diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/usb/gspca/mars.c index ff2c5ab..ff2c5ab 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/usb/gspca/mars.c diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/usb/gspca/mr97310a.c index 8f4714d..8f4714d 100644 --- a/drivers/media/video/gspca/mr97310a.c +++ b/drivers/media/usb/gspca/mr97310a.c diff --git a/drivers/media/video/gspca/nw80x.c b/drivers/media/usb/gspca/nw80x.c index 44c9964..44c9964 100644 --- a/drivers/media/video/gspca/nw80x.c +++ b/drivers/media/usb/gspca/nw80x.c diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c index bfc7cef..bfc7cef 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/usb/gspca/ov519.c diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/usb/gspca/ov534.c index bb09d78..bb09d78 100644 --- a/drivers/media/video/gspca/ov534.c +++ b/drivers/media/usb/gspca/ov534.c diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/usb/gspca/ov534_9.c index c4cd028..c4cd028 100644 --- a/drivers/media/video/gspca/ov534_9.c +++ b/drivers/media/usb/gspca/ov534_9.c diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c index d236d17..d236d17 100644 --- a/drivers/media/video/gspca/pac207.c +++ b/drivers/media/usb/gspca/pac207.c diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c index 4877f7a..4877f7a 100644 --- a/drivers/media/video/gspca/pac7302.c +++ b/drivers/media/usb/gspca/pac7302.c diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/usb/gspca/pac7311.c index ba3558d..ba3558d 100644 --- a/drivers/media/video/gspca/pac7311.c +++ b/drivers/media/usb/gspca/pac7311.c diff --git a/drivers/media/video/gspca/pac_common.h b/drivers/media/usb/gspca/pac_common.h index 8462a7c..8462a7c 100644 --- a/drivers/media/video/gspca/pac_common.h +++ b/drivers/media/usb/gspca/pac_common.h diff --git a/drivers/media/video/gspca/se401.c b/drivers/media/usb/gspca/se401.c index a33cb78..a33cb78 100644 --- a/drivers/media/video/gspca/se401.c +++ b/drivers/media/usb/gspca/se401.c diff --git a/drivers/media/video/gspca/se401.h b/drivers/media/usb/gspca/se401.h index 96d8ebf..96d8ebf 100644 --- a/drivers/media/video/gspca/se401.h +++ b/drivers/media/usb/gspca/se401.h diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/usb/gspca/sn9c2028.c index 03fa3fd..03fa3fd 100644 --- a/drivers/media/video/gspca/sn9c2028.c +++ b/drivers/media/usb/gspca/sn9c2028.c diff --git a/drivers/media/video/gspca/sn9c2028.h b/drivers/media/usb/gspca/sn9c2028.h index 8fd1d3e..8fd1d3e 100644 --- a/drivers/media/video/gspca/sn9c2028.h +++ b/drivers/media/usb/gspca/sn9c2028.h diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c index b9c6f17..b9c6f17 100644 --- a/drivers/media/video/gspca/sn9c20x.c +++ b/drivers/media/usb/gspca/sn9c20x.c diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/usb/gspca/sonixb.c index fd1f8d2..fd1f8d2 100644 --- a/drivers/media/video/gspca/sonixb.c +++ b/drivers/media/usb/gspca/sonixb.c diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c index 150b2df..150b2df 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/usb/gspca/sonixj.c diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/usb/gspca/spca1528.c index 14d6352..14d6352 100644 --- a/drivers/media/video/gspca/spca1528.c +++ b/drivers/media/usb/gspca/spca1528.c diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/usb/gspca/spca500.c index 25cb68d..25cb68d 100644 --- a/drivers/media/video/gspca/spca500.c +++ b/drivers/media/usb/gspca/spca500.c diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/usb/gspca/spca501.c index 3b7f777..3b7f777 100644 --- a/drivers/media/video/gspca/spca501.c +++ b/drivers/media/usb/gspca/spca501.c diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/usb/gspca/spca505.c index bc7d67c..bc7d67c 100644 --- a/drivers/media/video/gspca/spca505.c +++ b/drivers/media/usb/gspca/spca505.c diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/usb/gspca/spca506.c index 969bb5a..969bb5a 100644 --- a/drivers/media/video/gspca/spca506.c +++ b/drivers/media/usb/gspca/spca506.c diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/usb/gspca/spca508.c index 1286b41..1286b41 100644 --- a/drivers/media/video/gspca/spca508.c +++ b/drivers/media/usb/gspca/spca508.c diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/usb/gspca/spca561.c index cfe71dd..cfe71dd 100644 --- a/drivers/media/video/gspca/spca561.c +++ b/drivers/media/usb/gspca/spca561.c diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/usb/gspca/sq905.c index a8ac979..a8ac979 100644 --- a/drivers/media/video/gspca/sq905.c +++ b/drivers/media/usb/gspca/sq905.c diff --git a/drivers/media/video/gspca/sq905c.c b/drivers/media/usb/gspca/sq905c.c index 70fae69..70fae69 100644 --- a/drivers/media/video/gspca/sq905c.c +++ b/drivers/media/usb/gspca/sq905c.c diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/usb/gspca/sq930x.c index 7e8748b..7e8748b 100644 --- a/drivers/media/video/gspca/sq930x.c +++ b/drivers/media/usb/gspca/sq930x.c diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/usb/gspca/stk014.c index 8c09826..8c09826 100644 --- a/drivers/media/video/gspca/stk014.c +++ b/drivers/media/usb/gspca/stk014.c diff --git a/drivers/media/video/gspca/stv0680.c b/drivers/media/usb/gspca/stv0680.c index 6760527..6760527 100644 --- a/drivers/media/video/gspca/stv0680.c +++ b/drivers/media/usb/gspca/stv0680.c diff --git a/drivers/media/video/gspca/stv06xx/Kconfig b/drivers/media/usb/gspca/stv06xx/Kconfig index 634ad38d..634ad38d 100644 --- a/drivers/media/video/gspca/stv06xx/Kconfig +++ b/drivers/media/usb/gspca/stv06xx/Kconfig diff --git a/drivers/media/video/gspca/stv06xx/Makefile b/drivers/media/usb/gspca/stv06xx/Makefile index 38bc410..3a4b2f8 100644 --- a/drivers/media/video/gspca/stv06xx/Makefile +++ b/drivers/media/usb/gspca/stv06xx/Makefile @@ -6,5 +6,5 @@ gspca_stv06xx-objs := stv06xx.o \ stv06xx_pb0100.o \ stv06xx_st6422.o -ccflags-y += -I$(srctree)/drivers/media/video/gspca +ccflags-y += -I$(srctree)/drivers/media/usb/gspca diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c index 999ec77..999ec77 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.h b/drivers/media/usb/gspca/stv06xx/stv06xx.h index 34957a4..34957a4 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.h +++ b/drivers/media/usb/gspca/stv06xx/stv06xx.h diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c b/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c index 06fa54c5e..06fa54c5e 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h b/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.h index 1ba9158..1ba9158 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.h diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c index cdfc3d0..cdfc3d0 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.h index 5071e53..5071e53 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.h diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_sensor.h b/drivers/media/usb/gspca/stv06xx/stv06xx_sensor.h index 3a498c2..3a498c2 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_sensor.h +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_sensor.h diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c b/drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c index 8a57990..8a57990 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_st6422.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h b/drivers/media/usb/gspca/stv06xx/stv06xx_st6422.h index 8f20fbf..8f20fbf 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_st6422.h +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_st6422.h diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c index 748e142..748e142 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.h index 53e67b4..53e67b4 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.h diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/usb/gspca/sunplus.c index 9ccfcb1..9ccfcb1 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/usb/gspca/sunplus.c diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/usb/gspca/t613.c index 8bc6c3ce..8bc6c3ce 100644 --- a/drivers/media/video/gspca/t613.c +++ b/drivers/media/usb/gspca/t613.c diff --git a/drivers/media/video/gspca/topro.c b/drivers/media/usb/gspca/topro.c index a605524..a605524 100644 --- a/drivers/media/video/gspca/topro.c +++ b/drivers/media/usb/gspca/topro.c diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/usb/gspca/tv8532.c index 8591324..8591324 100644 --- a/drivers/media/video/gspca/tv8532.c +++ b/drivers/media/usb/gspca/tv8532.c diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/usb/gspca/vc032x.c index e500795..e500795 100644 --- a/drivers/media/video/gspca/vc032x.c +++ b/drivers/media/usb/gspca/vc032x.c diff --git a/drivers/media/video/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c index b1a64b9..b1a64b9 100644 --- a/drivers/media/video/gspca/vicam.c +++ b/drivers/media/usb/gspca/vicam.c diff --git a/drivers/media/video/gspca/w996Xcf.c b/drivers/media/usb/gspca/w996Xcf.c index 9e3a909..9e3a909 100644 --- a/drivers/media/video/gspca/w996Xcf.c +++ b/drivers/media/usb/gspca/w996Xcf.c diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/usb/gspca/xirlink_cit.c index 13b8d39..13b8d39 100644 --- a/drivers/media/video/gspca/xirlink_cit.c +++ b/drivers/media/usb/gspca/xirlink_cit.c diff --git a/drivers/media/video/gspca/zc3xx-reg.h b/drivers/media/usb/gspca/zc3xx-reg.h index a1bd94e..a1bd94e 100644 --- a/drivers/media/video/gspca/zc3xx-reg.h +++ b/drivers/media/usb/gspca/zc3xx-reg.h diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c index f0bacee..f0bacee 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/usb/gspca/zc3xx.c diff --git a/drivers/media/video/hdpvr/Kconfig b/drivers/media/usb/hdpvr/Kconfig index de247f3..de247f3 100644 --- a/drivers/media/video/hdpvr/Kconfig +++ b/drivers/media/usb/hdpvr/Kconfig diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/usb/hdpvr/Makefile index 52f057f..52f057f 100644 --- a/drivers/media/video/hdpvr/Makefile +++ b/drivers/media/usb/hdpvr/Makefile diff --git a/drivers/media/video/hdpvr/hdpvr-control.c b/drivers/media/usb/hdpvr/hdpvr-control.c index ae8f229..ae8f229 100644 --- a/drivers/media/video/hdpvr/hdpvr-control.c +++ b/drivers/media/usb/hdpvr/hdpvr-control.c diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c index 304f43e..304f43e 100644 --- a/drivers/media/video/hdpvr/hdpvr-core.c +++ b/drivers/media/usb/hdpvr/hdpvr-core.c diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/usb/hdpvr/hdpvr-i2c.c index 82e819f..82e819f 100644 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c +++ b/drivers/media/usb/hdpvr/hdpvr-i2c.c diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index 0e9e156..0e9e156 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/usb/hdpvr/hdpvr-video.c diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/usb/hdpvr/hdpvr.h index fea3c69..fea3c69 100644 --- a/drivers/media/video/hdpvr/hdpvr.h +++ b/drivers/media/usb/hdpvr/hdpvr.h diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/usb/pvrusb2/Kconfig index 25e412e..25e412e 100644 --- a/drivers/media/video/pvrusb2/Kconfig +++ b/drivers/media/usb/pvrusb2/Kconfig diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/usb/pvrusb2/Makefile index bc716db..bc716db 100644 --- a/drivers/media/video/pvrusb2/Makefile +++ b/drivers/media/usb/pvrusb2/Makefile diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/usb/pvrusb2/pvrusb2-audio.c index cc06d5e..cc06d5e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-audio.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.h b/drivers/media/usb/pvrusb2/pvrusb2-audio.h index e3e63d7..e3e63d7 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-audio.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/usb/pvrusb2/pvrusb2-context.c index 7c19ff7..7c19ff7 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-context.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-context.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.h b/drivers/media/usb/pvrusb2/pvrusb2-context.h index d657e53..d657e53 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-context.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-context.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c b/drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c index 8832090..8832090 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h b/drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h index 53ba548..53ba548 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/usb/pvrusb2/pvrusb2-ctrl.c index 7d5a713..7d5a713 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-ctrl.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h b/drivers/media/usb/pvrusb2/pvrusb2-ctrl.h index 794ff90..794ff90 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-ctrl.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c index c514d0b..c514d0b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h index e35c232..e35c232 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-debug.h b/drivers/media/usb/pvrusb2/pvrusb2-debug.h index be79249..be79249 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-debug.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-debug.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c index 4279ebb..4279ebb 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.h b/drivers/media/usb/pvrusb2/pvrusb2-debugifc.h index 2f8d467..2f8d467 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-debugifc.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/usb/pvrusb2/pvrusb2-devattr.c index adc501d3..adc501d3 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-devattr.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/usb/pvrusb2/pvrusb2-devattr.h index 273c8d4..273c8d4 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-devattr.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/drivers/media/usb/pvrusb2/pvrusb2-dvb.c index 8c95793..8c95793 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-dvb.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-dvb.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/drivers/media/usb/pvrusb2/pvrusb2-dvb.h index 884ff91..884ff91 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-dvb.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-dvb.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/usb/pvrusb2/pvrusb2-eeprom.c index 9515f3a..9515f3a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-eeprom.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.h b/drivers/media/usb/pvrusb2/pvrusb2-eeprom.h index cca3216..cca3216 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-eeprom.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c index e046fda..e046fda 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-encoder.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.h b/drivers/media/usb/pvrusb2/pvrusb2-encoder.h index 232fefb..232fefb 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-encoder.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-encoder.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h b/drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h index 614755e..614755e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h index 036952f..036952f 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index fb828ba..fb828ba 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/usb/pvrusb2/pvrusb2-hdw.h index 8060fc6..8060fc6 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c index 885ce11..885ce11 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h index 6a757692..6a757692 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/usb/pvrusb2/pvrusb2-io.c index 20b6ae0..20b6ae0 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-io.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-io.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.h b/drivers/media/usb/pvrusb2/pvrusb2-io.h index afb7e87..afb7e87 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-io.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-io.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c index bba6115..bba6115 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.h b/drivers/media/usb/pvrusb2/pvrusb2-ioread.h index 100e078..100e078 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ioread.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-ioread.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/usb/pvrusb2/pvrusb2-main.c index c1d9bb6..c1d9bb6 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-main.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/usb/pvrusb2/pvrusb2-std.c index 453627b..453627b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-std.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-std.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.h b/drivers/media/usb/pvrusb2/pvrusb2-std.h index a35c53d..a35c53d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-std.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-std.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/usb/pvrusb2/pvrusb2-sysfs.c index 6ef1335..6ef1335 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-sysfs.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.h b/drivers/media/usb/pvrusb2/pvrusb2-sysfs.h index 6d875bf..6d875bf 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-sysfs.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-util.h b/drivers/media/usb/pvrusb2/pvrusb2-util.h index 92b7554..92b7554 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-util.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-util.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c index f344aed..f344aed 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.h b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.h index 34c011a..34c011a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c index 2e205c9..2e205c9 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h b/drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h index 3b0bd5d..3b0bd5d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/usb/pvrusb2/pvrusb2-wm8775.c index 3ac8d75..3ac8d75 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-wm8775.c diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.h b/drivers/media/usb/pvrusb2/pvrusb2-wm8775.h index 0577bc7..0577bc7 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-wm8775.h diff --git a/drivers/media/video/pvrusb2/pvrusb2.h b/drivers/media/usb/pvrusb2/pvrusb2.h index 240de9b..240de9b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2.h +++ b/drivers/media/usb/pvrusb2/pvrusb2.h diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/usb/pwc/Kconfig index d63d0a8..d63d0a8 100644 --- a/drivers/media/video/pwc/Kconfig +++ b/drivers/media/usb/pwc/Kconfig diff --git a/drivers/media/video/pwc/Makefile b/drivers/media/usb/pwc/Makefile index f5c8ec2..f5c8ec2 100644 --- a/drivers/media/video/pwc/Makefile +++ b/drivers/media/usb/pwc/Makefile diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/usb/pwc/philips.txt index d38dd79..d38dd79 100644 --- a/drivers/media/video/pwc/philips.txt +++ b/drivers/media/usb/pwc/philips.txt diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/usb/pwc/pwc-ctrl.c index 1f506fd..1f506fd 100644 --- a/drivers/media/video/pwc/pwc-ctrl.c +++ b/drivers/media/usb/pwc/pwc-ctrl.c diff --git a/drivers/media/video/pwc/pwc-dec1.c b/drivers/media/usb/pwc/pwc-dec1.c index e899036..e899036 100644 --- a/drivers/media/video/pwc/pwc-dec1.c +++ b/drivers/media/usb/pwc/pwc-dec1.c diff --git a/drivers/media/video/pwc/pwc-dec1.h b/drivers/media/usb/pwc/pwc-dec1.h index c565ef8..c565ef8 100644 --- a/drivers/media/video/pwc/pwc-dec1.h +++ b/drivers/media/usb/pwc/pwc-dec1.h diff --git a/drivers/media/video/pwc/pwc-dec23.c b/drivers/media/usb/pwc/pwc-dec23.c index 3792fed..3792fed 100644 --- a/drivers/media/video/pwc/pwc-dec23.c +++ b/drivers/media/usb/pwc/pwc-dec23.c diff --git a/drivers/media/video/pwc/pwc-dec23.h b/drivers/media/usb/pwc/pwc-dec23.h index c655b1c..c655b1c 100644 --- a/drivers/media/video/pwc/pwc-dec23.h +++ b/drivers/media/usb/pwc/pwc-dec23.h diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index de7c7ba..de7c7ba 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c diff --git a/drivers/media/video/pwc/pwc-kiara.c b/drivers/media/usb/pwc/pwc-kiara.c index e5f4fd8..e5f4fd8 100644 --- a/drivers/media/video/pwc/pwc-kiara.c +++ b/drivers/media/usb/pwc/pwc-kiara.c diff --git a/drivers/media/video/pwc/pwc-kiara.h b/drivers/media/usb/pwc/pwc-kiara.h index 8e02b7a..8e02b7a 100644 --- a/drivers/media/video/pwc/pwc-kiara.h +++ b/drivers/media/usb/pwc/pwc-kiara.h diff --git a/drivers/media/video/pwc/pwc-misc.c b/drivers/media/usb/pwc/pwc-misc.c index 9be5adf..9be5adf 100644 --- a/drivers/media/video/pwc/pwc-misc.c +++ b/drivers/media/usb/pwc/pwc-misc.c diff --git a/drivers/media/video/pwc/pwc-nala.h b/drivers/media/usb/pwc/pwc-nala.h index 168c73e..168c73e 100644 --- a/drivers/media/video/pwc/pwc-nala.h +++ b/drivers/media/usb/pwc/pwc-nala.h diff --git a/drivers/media/video/pwc/pwc-timon.c b/drivers/media/usb/pwc/pwc-timon.c index c56c174..c56c174 100644 --- a/drivers/media/video/pwc/pwc-timon.c +++ b/drivers/media/usb/pwc/pwc-timon.c diff --git a/drivers/media/video/pwc/pwc-timon.h b/drivers/media/usb/pwc/pwc-timon.h index 270c5b9..270c5b9 100644 --- a/drivers/media/video/pwc/pwc-timon.h +++ b/drivers/media/usb/pwc/pwc-timon.h diff --git a/drivers/media/video/pwc/pwc-uncompress.c b/drivers/media/usb/pwc/pwc-uncompress.c index b65903f..b65903f 100644 --- a/drivers/media/video/pwc/pwc-uncompress.c +++ b/drivers/media/usb/pwc/pwc-uncompress.c diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/usb/pwc/pwc-v4l.c index 545e9bb..545e9bb 100644 --- a/drivers/media/video/pwc/pwc-v4l.c +++ b/drivers/media/usb/pwc/pwc-v4l.c diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/usb/pwc/pwc.h index 7a6a0d3..7a6a0d3 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/usb/pwc/pwc.h diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/usb/sn9c102/Kconfig index 6ebaf29..6ebaf29 100644 --- a/drivers/media/video/sn9c102/Kconfig +++ b/drivers/media/usb/sn9c102/Kconfig diff --git a/drivers/media/video/sn9c102/Makefile b/drivers/media/usb/sn9c102/Makefile index 7ecd5a9..7ecd5a9 100644 --- a/drivers/media/video/sn9c102/Makefile +++ b/drivers/media/usb/sn9c102/Makefile diff --git a/drivers/media/video/sn9c102/sn9c102.h b/drivers/media/usb/sn9c102/sn9c102.h index 2bc153e..2bc153e 100644 --- a/drivers/media/video/sn9c102/sn9c102.h +++ b/drivers/media/usb/sn9c102/sn9c102.h diff --git a/drivers/media/video/sn9c102/sn9c102_config.h b/drivers/media/usb/sn9c102/sn9c102_config.h index 0f4e037..0f4e037 100644 --- a/drivers/media/video/sn9c102/sn9c102_config.h +++ b/drivers/media/usb/sn9c102/sn9c102_config.h diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/usb/sn9c102/sn9c102_core.c index 19ea780..19ea780 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/usb/sn9c102/sn9c102_core.c diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/usb/sn9c102/sn9c102_devtable.h index b3d2cc7..b3d2cc7 100644 --- a/drivers/media/video/sn9c102/sn9c102_devtable.h +++ b/drivers/media/usb/sn9c102/sn9c102_devtable.h diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131d.c b/drivers/media/usb/sn9c102/sn9c102_hv7131d.c index 2dce5c9..2dce5c9 100644 --- a/drivers/media/video/sn9c102/sn9c102_hv7131d.c +++ b/drivers/media/usb/sn9c102/sn9c102_hv7131d.c diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131r.c b/drivers/media/usb/sn9c102/sn9c102_hv7131r.c index 4295887..4295887 100644 --- a/drivers/media/video/sn9c102/sn9c102_hv7131r.c +++ b/drivers/media/usb/sn9c102/sn9c102_hv7131r.c diff --git a/drivers/media/video/sn9c102/sn9c102_mi0343.c b/drivers/media/usb/sn9c102/sn9c102_mi0343.c index 1f5b09b..1f5b09b 100644 --- a/drivers/media/video/sn9c102/sn9c102_mi0343.c +++ b/drivers/media/usb/sn9c102/sn9c102_mi0343.c diff --git a/drivers/media/video/sn9c102/sn9c102_mi0360.c b/drivers/media/usb/sn9c102/sn9c102_mi0360.c index d973fc1..d973fc1 100644 --- a/drivers/media/video/sn9c102/sn9c102_mi0360.c +++ b/drivers/media/usb/sn9c102/sn9c102_mi0360.c diff --git a/drivers/media/video/sn9c102/sn9c102_mt9v111.c b/drivers/media/usb/sn9c102/sn9c102_mt9v111.c index 95986eb..95986eb 100644 --- a/drivers/media/video/sn9c102/sn9c102_mt9v111.c +++ b/drivers/media/usb/sn9c102/sn9c102_mt9v111.c diff --git a/drivers/media/video/sn9c102/sn9c102_ov7630.c b/drivers/media/usb/sn9c102/sn9c102_ov7630.c index 803712c..803712c 100644 --- a/drivers/media/video/sn9c102/sn9c102_ov7630.c +++ b/drivers/media/usb/sn9c102/sn9c102_ov7630.c diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/usb/sn9c102/sn9c102_ov7660.c index 7977795..7977795 100644 --- a/drivers/media/video/sn9c102/sn9c102_ov7660.c +++ b/drivers/media/usb/sn9c102/sn9c102_ov7660.c diff --git a/drivers/media/video/sn9c102/sn9c102_pas106b.c b/drivers/media/usb/sn9c102/sn9c102_pas106b.c index 81cd969..81cd969 100644 --- a/drivers/media/video/sn9c102/sn9c102_pas106b.c +++ b/drivers/media/usb/sn9c102/sn9c102_pas106b.c diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/usb/sn9c102/sn9c102_pas202bcb.c index 2e86fdc..2e86fdc 100644 --- a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c +++ b/drivers/media/usb/sn9c102/sn9c102_pas202bcb.c diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/usb/sn9c102/sn9c102_sensor.h index 3679970..3679970 100644 --- a/drivers/media/video/sn9c102/sn9c102_sensor.h +++ b/drivers/media/usb/sn9c102/sn9c102_sensor.h diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c b/drivers/media/usb/sn9c102/sn9c102_tas5110c1b.c index 04cdfdd..04cdfdd 100644 --- a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c +++ b/drivers/media/usb/sn9c102/sn9c102_tas5110c1b.c diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110d.c b/drivers/media/usb/sn9c102/sn9c102_tas5110d.c index 9372e6f9..9372e6f9 100644 --- a/drivers/media/video/sn9c102/sn9c102_tas5110d.c +++ b/drivers/media/usb/sn9c102/sn9c102_tas5110d.c diff --git a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c b/drivers/media/usb/sn9c102/sn9c102_tas5130d1b.c index a30bbc4..a30bbc4 100644 --- a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c +++ b/drivers/media/usb/sn9c102/sn9c102_tas5130d1b.c diff --git a/drivers/media/video/stk1160/Kconfig b/drivers/media/usb/stk1160/Kconfig index 1c3a1ec..1c3a1ec 100644 --- a/drivers/media/video/stk1160/Kconfig +++ b/drivers/media/usb/stk1160/Kconfig diff --git a/drivers/media/video/stk1160/Makefile b/drivers/media/usb/stk1160/Makefile index 8a3c784..8a3c784 100644 --- a/drivers/media/video/stk1160/Makefile +++ b/drivers/media/usb/stk1160/Makefile diff --git a/drivers/media/video/stk1160/stk1160-ac97.c b/drivers/media/usb/stk1160/stk1160-ac97.c index 8d325f5..8d325f5 100644 --- a/drivers/media/video/stk1160/stk1160-ac97.c +++ b/drivers/media/usb/stk1160/stk1160-ac97.c diff --git a/drivers/media/video/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c index 74236fd..74236fd 100644 --- a/drivers/media/video/stk1160/stk1160-core.c +++ b/drivers/media/usb/stk1160/stk1160-core.c diff --git a/drivers/media/video/stk1160/stk1160-i2c.c b/drivers/media/usb/stk1160/stk1160-i2c.c index 176ac93..176ac93 100644 --- a/drivers/media/video/stk1160/stk1160-i2c.c +++ b/drivers/media/usb/stk1160/stk1160-i2c.c diff --git a/drivers/media/video/stk1160/stk1160-reg.h b/drivers/media/usb/stk1160/stk1160-reg.h index 3e49da6..3e49da6 100644 --- a/drivers/media/video/stk1160/stk1160-reg.h +++ b/drivers/media/usb/stk1160/stk1160-reg.h diff --git a/drivers/media/video/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c index 360bdbe..360bdbe 100644 --- a/drivers/media/video/stk1160/stk1160-v4l.c +++ b/drivers/media/usb/stk1160/stk1160-v4l.c diff --git a/drivers/media/video/stk1160/stk1160-video.c b/drivers/media/usb/stk1160/stk1160-video.c index 3785269..3785269 100644 --- a/drivers/media/video/stk1160/stk1160-video.c +++ b/drivers/media/usb/stk1160/stk1160-video.c diff --git a/drivers/media/video/stk1160/stk1160.h b/drivers/media/usb/stk1160/stk1160.h index 3feba00..3feba00 100644 --- a/drivers/media/video/stk1160/stk1160.h +++ b/drivers/media/usb/stk1160/stk1160.h diff --git a/drivers/media/video/tlg2300/Kconfig b/drivers/media/usb/tlg2300/Kconfig index 645d915..645d915 100644 --- a/drivers/media/video/tlg2300/Kconfig +++ b/drivers/media/usb/tlg2300/Kconfig diff --git a/drivers/media/video/tlg2300/Makefile b/drivers/media/usb/tlg2300/Makefile index 4d66087..4d66087 100644 --- a/drivers/media/video/tlg2300/Makefile +++ b/drivers/media/usb/tlg2300/Makefile diff --git a/drivers/media/video/tlg2300/pd-alsa.c b/drivers/media/usb/tlg2300/pd-alsa.c index 9f8b7da..9f8b7da 100644 --- a/drivers/media/video/tlg2300/pd-alsa.c +++ b/drivers/media/usb/tlg2300/pd-alsa.c diff --git a/drivers/media/video/tlg2300/pd-common.h b/drivers/media/usb/tlg2300/pd-common.h index 5dd73b7..5dd73b7 100644 --- a/drivers/media/video/tlg2300/pd-common.h +++ b/drivers/media/usb/tlg2300/pd-common.h diff --git a/drivers/media/video/tlg2300/pd-dvb.c b/drivers/media/usb/tlg2300/pd-dvb.c index 30fcb11..30fcb11 100644 --- a/drivers/media/video/tlg2300/pd-dvb.c +++ b/drivers/media/usb/tlg2300/pd-dvb.c diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/usb/tlg2300/pd-main.c index 7b1f6eb..7b1f6eb 100644 --- a/drivers/media/video/tlg2300/pd-main.c +++ b/drivers/media/usb/tlg2300/pd-main.c diff --git a/drivers/media/video/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c index 4fad1df..4fad1df 100644 --- a/drivers/media/video/tlg2300/pd-radio.c +++ b/drivers/media/usb/tlg2300/pd-radio.c diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/usb/tlg2300/pd-video.c index bfbf9e5..bfbf9e5 100644 --- a/drivers/media/video/tlg2300/pd-video.c +++ b/drivers/media/usb/tlg2300/pd-video.c diff --git a/drivers/media/video/tlg2300/vendorcmds.h b/drivers/media/usb/tlg2300/vendorcmds.h index ba6f4ae..ba6f4ae 100644 --- a/drivers/media/video/tlg2300/vendorcmds.h +++ b/drivers/media/usb/tlg2300/vendorcmds.h diff --git a/drivers/media/video/tm6000/Kconfig b/drivers/media/usb/tm6000/Kconfig index a43b77a..a43b77a 100644 --- a/drivers/media/video/tm6000/Kconfig +++ b/drivers/media/usb/tm6000/Kconfig diff --git a/drivers/media/video/tm6000/Makefile b/drivers/media/usb/tm6000/Makefile index 1feb8c9..1feb8c9 100644 --- a/drivers/media/video/tm6000/Makefile +++ b/drivers/media/usb/tm6000/Makefile diff --git a/drivers/media/video/tm6000/tm6000-alsa.c b/drivers/media/usb/tm6000/tm6000-alsa.c index bd07ec7..bd07ec7 100644 --- a/drivers/media/video/tm6000/tm6000-alsa.c +++ b/drivers/media/usb/tm6000/tm6000-alsa.c diff --git a/drivers/media/video/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c index 034659b..034659b 100644 --- a/drivers/media/video/tm6000/tm6000-cards.c +++ b/drivers/media/usb/tm6000/tm6000-cards.c diff --git a/drivers/media/video/tm6000/tm6000-core.c b/drivers/media/usb/tm6000/tm6000-core.c index 22cc011..22cc011 100644 --- a/drivers/media/video/tm6000/tm6000-core.c +++ b/drivers/media/usb/tm6000/tm6000-core.c diff --git a/drivers/media/video/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c index e1f3f66..e1f3f66 100644 --- a/drivers/media/video/tm6000/tm6000-dvb.c +++ b/drivers/media/usb/tm6000/tm6000-dvb.c diff --git a/drivers/media/video/tm6000/tm6000-i2c.c b/drivers/media/usb/tm6000/tm6000-i2c.c index c7e23e3..c7e23e3 100644 --- a/drivers/media/video/tm6000/tm6000-i2c.c +++ b/drivers/media/usb/tm6000/tm6000-i2c.c diff --git a/drivers/media/video/tm6000/tm6000-input.c b/drivers/media/usb/tm6000/tm6000-input.c index e80b7e1..e80b7e1 100644 --- a/drivers/media/video/tm6000/tm6000-input.c +++ b/drivers/media/usb/tm6000/tm6000-input.c diff --git a/drivers/media/video/tm6000/tm6000-regs.h b/drivers/media/usb/tm6000/tm6000-regs.h index a38c251..a38c251 100644 --- a/drivers/media/video/tm6000/tm6000-regs.h +++ b/drivers/media/usb/tm6000/tm6000-regs.h diff --git a/drivers/media/video/tm6000/tm6000-stds.c b/drivers/media/usb/tm6000/tm6000-stds.c index 5e28d6a..5e28d6a 100644 --- a/drivers/media/video/tm6000/tm6000-stds.c +++ b/drivers/media/usb/tm6000/tm6000-stds.c diff --git a/drivers/media/video/tm6000/tm6000-usb-isoc.h b/drivers/media/usb/tm6000/tm6000-usb-isoc.h index 99d15a5..99d15a5 100644 --- a/drivers/media/video/tm6000/tm6000-usb-isoc.h +++ b/drivers/media/usb/tm6000/tm6000-usb-isoc.h diff --git a/drivers/media/video/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c index 45ed59c..45ed59c 100644 --- a/drivers/media/video/tm6000/tm6000-video.c +++ b/drivers/media/usb/tm6000/tm6000-video.c diff --git a/drivers/media/video/tm6000/tm6000.h b/drivers/media/usb/tm6000/tm6000.h index 6df4186..6df4186 100644 --- a/drivers/media/video/tm6000/tm6000.h +++ b/drivers/media/usb/tm6000/tm6000.h diff --git a/drivers/media/video/usbvision/Kconfig b/drivers/media/usb/usbvision/Kconfig index fc24ef0..fc24ef0 100644 --- a/drivers/media/video/usbvision/Kconfig +++ b/drivers/media/usb/usbvision/Kconfig diff --git a/drivers/media/video/usbvision/Makefile b/drivers/media/usb/usbvision/Makefile index d55c6bd..d55c6bd 100644 --- a/drivers/media/video/usbvision/Makefile +++ b/drivers/media/usb/usbvision/Makefile diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/usb/usbvision/usbvision-cards.c index 3103d0d..3103d0d 100644 --- a/drivers/media/video/usbvision/usbvision-cards.c +++ b/drivers/media/usb/usbvision/usbvision-cards.c diff --git a/drivers/media/video/usbvision/usbvision-cards.h b/drivers/media/usb/usbvision/usbvision-cards.h index a51cc11..a51cc11 100644 --- a/drivers/media/video/usbvision/usbvision-cards.h +++ b/drivers/media/usb/usbvision/usbvision-cards.h diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c index c9b2042..c9b2042 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/usb/usbvision/usbvision-core.c diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/usb/usbvision/usbvision-i2c.c index 89fec02..89fec02 100644 --- a/drivers/media/video/usbvision/usbvision-i2c.c +++ b/drivers/media/usb/usbvision/usbvision-i2c.c diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c index 8a43179..8a43179 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/usb/usbvision/usbvision-video.c diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/usb/usbvision/usbvision.h index 43cf61f..43cf61f 100644 --- a/drivers/media/video/usbvision/usbvision.h +++ b/drivers/media/usb/usbvision/usbvision.h diff --git a/drivers/media/video/uvc/Kconfig b/drivers/media/usb/uvc/Kconfig index 541c9f1..541c9f1 100644 --- a/drivers/media/video/uvc/Kconfig +++ b/drivers/media/usb/uvc/Kconfig diff --git a/drivers/media/video/uvc/Makefile b/drivers/media/usb/uvc/Makefile index c26d12f..c26d12f 100644 --- a/drivers/media/video/uvc/Makefile +++ b/drivers/media/usb/uvc/Makefile diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index f7061a5..f7061a5 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c diff --git a/drivers/media/video/uvc/uvc_debugfs.c b/drivers/media/usb/uvc/uvc_debugfs.c index 14561a5..14561a5 100644 --- a/drivers/media/video/uvc/uvc_debugfs.c +++ b/drivers/media/usb/uvc/uvc_debugfs.c diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 45d7aa1..45d7aa1 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c index 29e2399..29e2399 100644 --- a/drivers/media/video/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c diff --git a/drivers/media/video/uvc/uvc_isight.c b/drivers/media/usb/uvc/uvc_isight.c index 8510e725..8510e725 100644 --- a/drivers/media/video/uvc/uvc_isight.c +++ b/drivers/media/usb/uvc/uvc_isight.c diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index 9288fbd..9288fbd 100644 --- a/drivers/media/video/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c index b749277..b749277 100644 --- a/drivers/media/video/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index f00db30..f00db30 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 1c15b42..1c15b42 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 3764040..3764040 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 068e8da..097b17ce 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -616,16 +616,6 @@ menuconfig V4L_USB_DRIVERS if V4L_USB_DRIVERS && MEDIA_CAMERA_SUPPORT - comment "Webcam devices" - -source "drivers/media/video/uvc/Kconfig" - -source "drivers/media/video/gspca/Kconfig" - -source "drivers/media/video/pwc/Kconfig" - -source "drivers/media/video/cpia2/Kconfig" - config USB_ZR364XX tristate "USB ZR364XX Camera support" depends on VIDEO_V4L2 @@ -662,40 +652,9 @@ config USB_S2255 Say Y here if you want support for the Sensoray 2255 USB device. This driver can be compiled as a module, called s2255drv. -source "drivers/media/video/sn9c102/Kconfig" endif # V4L_USB_DRIVERS && MEDIA_CAMERA_SUPPORT -if V4L_USB_DRIVERS - - comment "Webcam and/or TV USB devices" - -source "drivers/media/video/em28xx/Kconfig" - -endif - -if V4L_USB_DRIVERS && MEDIA_ANALOG_TV_SUPPORT - - comment "TV USB devices" - -source "drivers/media/video/au0828/Kconfig" - -source "drivers/media/video/pvrusb2/Kconfig" - -source "drivers/media/video/hdpvr/Kconfig" - -source "drivers/media/video/tlg2300/Kconfig" - -source "drivers/media/video/cx231xx/Kconfig" - -source "drivers/media/video/tm6000/Kconfig" - -source "drivers/media/video/usbvision/Kconfig" - -source "drivers/media/video/stk1160/Kconfig" - -endif # V4L_USB_DRIVERS - # # PCI drivers configuration - No devices here are for webcams # diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 9dff3e2..a22a258 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -99,20 +99,12 @@ obj-$(CONFIG_VIDEO_VINO) += vino.o obj-$(CONFIG_VIDEO_MEYE) += meye.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ obj-$(CONFIG_VIDEO_CX88) += cx88/ -obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ -obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/ -obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/ obj-$(CONFIG_VIDEO_CX25821) += cx25821/ -obj-$(CONFIG_VIDEO_USBVISION) += usbvision/ -obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ -obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ -obj-$(CONFIG_VIDEO_TM6000) += tm6000/ obj-$(CONFIG_VIDEO_MXB) += mxb.o obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o obj-$(CONFIG_STA2X11_VIP) += sta2x11_vip.o obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o -obj-$(CONFIG_VIDEO_STK1160) += stk1160/ obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o @@ -130,11 +122,6 @@ obj-$(CONFIG_VIDEO_OMAP3) += omap3isp/ obj-$(CONFIG_USB_ZR364XX) += zr364xx.o obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o -obj-$(CONFIG_USB_SN9C102) += sn9c102/ -obj-$(CONFIG_USB_PWC) += pwc/ -obj-$(CONFIG_USB_GSPCA) += gspca/ - -obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ obj-$(CONFIG_USB_S2255) += s2255drv.o @@ -179,9 +166,6 @@ obj-$(CONFIG_ARCH_DAVINCI) += davinci/ obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o -obj-$(CONFIG_VIDEO_AU0828) += au0828/ - -obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ obj-$(CONFIG_VIDEO_SAA7164) += saa7164/ obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o |