That's the second part of the media driver tree reorganization:
move the webcams, analog TV and hybrid TV USB drivers into the same menu
as the USB drivers.

The next step will be to move the PCI, platform drivers and I2C drivers
into /drivers/media, and finaly having a cleaner tree.

Mauro Carvalho Chehab (3):
  ioctl-number.txt: Remove legacy private ioctl's from media drivers
  [media] rename most media/video usb drivers to media/usb
  [media] move the remaining USB drivers to drivers/media/usb

 Documentation/ioctl/ioctl-number.txt               |  5 --
 MAINTAINERS                                        | 24 +++---
 drivers/media/usb/Kconfig                          | 44 +++++++++--
 drivers/media/usb/Makefile                         | 16 ++++
 drivers/media/{video => usb}/au0828/Kconfig        |  0
 drivers/media/{video => usb}/au0828/Makefile       |  0
 drivers/media/{video => usb}/au0828/au0828-cards.c |  0
 drivers/media/{video => usb}/au0828/au0828-cards.h |  0
 drivers/media/{video => usb}/au0828/au0828-core.c  |  0
 drivers/media/{video => usb}/au0828/au0828-dvb.c   |  0
 drivers/media/{video => usb}/au0828/au0828-i2c.c   |  0
 drivers/media/{video => usb}/au0828/au0828-reg.h   |  0
 drivers/media/{video => usb}/au0828/au0828-vbi.c   |  0
 drivers/media/{video => usb}/au0828/au0828-video.c |  0
 drivers/media/{video => usb}/au0828/au0828.h       |  0
 drivers/media/{video => usb}/cpia2/Kconfig         |  0
 drivers/media/{video => usb}/cpia2/Makefile        |  0
 drivers/media/{video => usb}/cpia2/cpia2.h         |  0
 drivers/media/{video => usb}/cpia2/cpia2_core.c    |  0
 .../media/{video => usb}/cpia2/cpia2_registers.h   |  0
 drivers/media/{video => usb}/cpia2/cpia2_usb.c     |  0
 drivers/media/{video => usb}/cpia2/cpia2_v4l.c     |  0
 drivers/media/{video => usb}/cx231xx/Kconfig       |  0
 drivers/media/{video => usb}/cx231xx/Makefile      |  0
 drivers/media/{video => usb}/cx231xx/cx231xx-417.c |  0
 .../media/{video => usb}/cx231xx/cx231xx-audio.c   |  0
 .../media/{video => usb}/cx231xx/cx231xx-avcore.c  |  0
 .../media/{video => usb}/cx231xx/cx231xx-cards.c   |  0
 .../{video => usb}/cx231xx/cx231xx-conf-reg.h      |  0
 .../media/{video => usb}/cx231xx/cx231xx-core.c    |  0
 drivers/media/{video => usb}/cx231xx/cx231xx-dif.h |  0
 drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c |  0
 drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c |  0
 .../media/{video => usb}/cx231xx/cx231xx-input.c   |  0
 .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c |  0
 .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h |  0
 drivers/media/{video => usb}/cx231xx/cx231xx-reg.h |  0
 drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c |  0
 drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h |  0
 .../media/{video => usb}/cx231xx/cx231xx-video.c   |  0
 drivers/media/{video => usb}/cx231xx/cx231xx.h     |  0
 drivers/media/{video => usb}/em28xx/Kconfig        |  0
 drivers/media/{video => usb}/em28xx/Makefile       |  0
 drivers/media/{video => usb}/em28xx/em28xx-audio.c |  0
 drivers/media/{video => usb}/em28xx/em28xx-cards.c |  0
 drivers/media/{video => usb}/em28xx/em28xx-core.c  |  0
 drivers/media/{video => usb}/em28xx/em28xx-dvb.c   |  0
 drivers/media/{video => usb}/em28xx/em28xx-i2c.c   |  0
 drivers/media/{video => usb}/em28xx/em28xx-input.c |  0
 drivers/media/{video => usb}/em28xx/em28xx-reg.h   |  0
 drivers/media/{video => usb}/em28xx/em28xx-vbi.c   |  0
 drivers/media/{video => usb}/em28xx/em28xx-video.c |  0
 drivers/media/{video => usb}/em28xx/em28xx.h       |  0
 drivers/media/{video => usb}/gspca/Kconfig         |  6 +-
 drivers/media/{video => usb}/gspca/Makefile        |  0
 .../{video => usb}/gspca/autogain_functions.c      |  0
 .../{video => usb}/gspca/autogain_functions.h      |  0
 drivers/media/{video => usb}/gspca/benq.c          |  0
 drivers/media/{video => usb}/gspca/conex.c         |  0
 drivers/media/{video => usb}/gspca/cpia1.c         |  0
 drivers/media/{video => usb}/gspca/etoms.c         |  0
 drivers/media/{video => usb}/gspca/finepix.c       |  0
 drivers/media/{video => usb}/gspca/gl860/Kconfig   |  0
 drivers/media/{video => usb}/gspca/gl860/Makefile  |  2 +-
 .../{video => usb}/gspca/gl860/gl860-mi1320.c      |  0
 .../{video => usb}/gspca/gl860/gl860-mi2020.c      |  0
 .../{video => usb}/gspca/gl860/gl860-ov2640.c      |  0
 .../{video => usb}/gspca/gl860/gl860-ov9655.c      |  0
 drivers/media/{video => usb}/gspca/gl860/gl860.c   |  0
 drivers/media/{video => usb}/gspca/gl860/gl860.h   |  0
 drivers/media/{video => usb}/gspca/gspca.c         |  0
 drivers/media/{video => usb}/gspca/gspca.h         |  0
 drivers/media/{video => usb}/gspca/jeilinj.c       |  0
 drivers/media/{video => usb}/gspca/jl2005bcd.c     |  0
 drivers/media/{video => usb}/gspca/jpeg.h          |  0
 drivers/media/{video => usb}/gspca/kinect.c        |  0
 drivers/media/{video => usb}/gspca/konica.c        |  0
 drivers/media/{video => usb}/gspca/m5602/Kconfig   |  0
 drivers/media/{video => usb}/gspca/m5602/Makefile  |  2 +-
 .../{video => usb}/gspca/m5602/m5602_bridge.h      |  0
 .../media/{video => usb}/gspca/m5602/m5602_core.c  |  0
 .../{video => usb}/gspca/m5602/m5602_mt9m111.c     |  0
 .../{video => usb}/gspca/m5602/m5602_mt9m111.h     |  0
 .../{video => usb}/gspca/m5602/m5602_ov7660.c      |  0
 .../{video => usb}/gspca/m5602/m5602_ov7660.h      |  0
 .../{video => usb}/gspca/m5602/m5602_ov9650.c      |  0
 .../{video => usb}/gspca/m5602/m5602_ov9650.h      |  0
 .../{video => usb}/gspca/m5602/m5602_po1030.c      |  0
 .../{video => usb}/gspca/m5602/m5602_po1030.h      |  0
 .../{video => usb}/gspca/m5602/m5602_s5k4aa.c      |  0
 .../{video => usb}/gspca/m5602/m5602_s5k4aa.h      |  0
 .../{video => usb}/gspca/m5602/m5602_s5k83a.c      |  0
 .../{video => usb}/gspca/m5602/m5602_s5k83a.h      |  0
 .../{video => usb}/gspca/m5602/m5602_sensor.h      |  0
 drivers/media/{video => usb}/gspca/mars.c          |  0
 drivers/media/{video => usb}/gspca/mr97310a.c      |  0
 drivers/media/{video => usb}/gspca/nw80x.c         |  0
 drivers/media/{video => usb}/gspca/ov519.c         |  0
 drivers/media/{video => usb}/gspca/ov534.c         |  0
 drivers/media/{video => usb}/gspca/ov534_9.c       |  0
 drivers/media/{video => usb}/gspca/pac207.c        |  0
 drivers/media/{video => usb}/gspca/pac7302.c       |  0
 drivers/media/{video => usb}/gspca/pac7311.c       |  0
 drivers/media/{video => usb}/gspca/pac_common.h    |  0
 drivers/media/{video => usb}/gspca/se401.c         |  0
 drivers/media/{video => usb}/gspca/se401.h         |  0
 drivers/media/{video => usb}/gspca/sn9c2028.c      |  0
 drivers/media/{video => usb}/gspca/sn9c2028.h      |  0
 drivers/media/{video => usb}/gspca/sn9c20x.c       |  0
 drivers/media/{video => usb}/gspca/sonixb.c        |  0
 drivers/media/{video => usb}/gspca/sonixj.c        |  0
 drivers/media/{video => usb}/gspca/spca1528.c      |  0
 drivers/media/{video => usb}/gspca/spca500.c       |  0
 drivers/media/{video => usb}/gspca/spca501.c       |  0
 drivers/media/{video => usb}/gspca/spca505.c       |  0
 drivers/media/{video => usb}/gspca/spca506.c       |  0
 drivers/media/{video => usb}/gspca/spca508.c       |  0
 drivers/media/{video => usb}/gspca/spca561.c       |  0
 drivers/media/{video => usb}/gspca/sq905.c         |  0
 drivers/media/{video => usb}/gspca/sq905c.c        |  0
 drivers/media/{video => usb}/gspca/sq930x.c        |  0
 drivers/media/{video => usb}/gspca/stk014.c        |  0
 drivers/media/{video => usb}/gspca/stv0680.c       |  0
 drivers/media/{video => usb}/gspca/stv06xx/Kconfig |  0
 .../media/{video => usb}/gspca/stv06xx/Makefile    |  2 +-
 .../media/{video => usb}/gspca/stv06xx/stv06xx.c   |  0
 .../media/{video => usb}/gspca/stv06xx/stv06xx.h   |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.c    |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.h    |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.c  |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.h  |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_sensor.h  |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_st6422.c  |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_st6422.h  |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.c  |  0
 .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.h  |  0
 drivers/media/{video => usb}/gspca/sunplus.c       |  0
 drivers/media/{video => usb}/gspca/t613.c          |  0
 drivers/media/{video => usb}/gspca/topro.c         |  0
 drivers/media/{video => usb}/gspca/tv8532.c        |  0
 drivers/media/{video => usb}/gspca/vc032x.c        |  0
 drivers/media/{video => usb}/gspca/vicam.c         |  0
 drivers/media/{video => usb}/gspca/w996Xcf.c       |  0
 drivers/media/{video => usb}/gspca/xirlink_cit.c   |  0
 drivers/media/{video => usb}/gspca/zc3xx-reg.h     |  0
 drivers/media/{video => usb}/gspca/zc3xx.c         |  0
 drivers/media/{video => usb}/hdpvr/Kconfig         |  0
 drivers/media/{video => usb}/hdpvr/Makefile        |  0
 drivers/media/{video => usb}/hdpvr/hdpvr-control.c |  0
 drivers/media/{video => usb}/hdpvr/hdpvr-core.c    |  0
 drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c     |  0
 drivers/media/{video => usb}/hdpvr/hdpvr-video.c   |  0
 drivers/media/{video => usb}/hdpvr/hdpvr.h         |  0
 drivers/media/{video => usb}/pvrusb2/Kconfig       |  0
 drivers/media/{video => usb}/pvrusb2/Makefile      |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-audio.c   |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-audio.h   |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-context.c |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-context.h |  0
 .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.c      |  0
 .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.h      |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.c    |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.h    |  0
 .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c   |  0
 .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h   |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-debug.h   |  0
 .../{video => usb}/pvrusb2/pvrusb2-debugifc.c      |  0
 .../{video => usb}/pvrusb2/pvrusb2-debugifc.h      |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-devattr.c |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-devattr.h |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.c  |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.h  |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-encoder.c |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-encoder.h |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h |  0
 .../{video => usb}/pvrusb2/pvrusb2-hdw-internal.h  |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h |  0
 .../{video => usb}/pvrusb2/pvrusb2-i2c-core.c      |  0
 .../{video => usb}/pvrusb2/pvrusb2-i2c-core.h      |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c  |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h  |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-ioread.c  |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-ioread.h  |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-main.c    |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.c   |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.h   |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-util.h    |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.c    |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.h    |  0
 .../{video => usb}/pvrusb2/pvrusb2-video-v4l.c     |  0
 .../{video => usb}/pvrusb2/pvrusb2-video-v4l.h     |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.c  |  0
 .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.h  |  0
 drivers/media/{video => usb}/pvrusb2/pvrusb2.h     |  0
 drivers/media/{video => usb}/pwc/Kconfig           |  0
 drivers/media/{video => usb}/pwc/Makefile          |  0
 drivers/media/{video => usb}/pwc/philips.txt       |  0
 drivers/media/{video => usb}/pwc/pwc-ctrl.c        |  0
 drivers/media/{video => usb}/pwc/pwc-dec1.c        |  0
 drivers/media/{video => usb}/pwc/pwc-dec1.h        |  0
 drivers/media/{video => usb}/pwc/pwc-dec23.c       |  0
 drivers/media/{video => usb}/pwc/pwc-dec23.h       |  0
 drivers/media/{video => usb}/pwc/pwc-if.c          |  0
 drivers/media/{video => usb}/pwc/pwc-kiara.c       |  0
 drivers/media/{video => usb}/pwc/pwc-kiara.h       |  0
 drivers/media/{video => usb}/pwc/pwc-misc.c        |  0
 drivers/media/{video => usb}/pwc/pwc-nala.h        |  0
 drivers/media/{video => usb}/pwc/pwc-timon.c       |  0
 drivers/media/{video => usb}/pwc/pwc-timon.h       |  0
 drivers/media/{video => usb}/pwc/pwc-uncompress.c  |  0
 drivers/media/{video => usb}/pwc/pwc-v4l.c         |  0
 drivers/media/{video => usb}/pwc/pwc.h             |  0
 drivers/media/{video => usb/s2255}/s2255drv.c      |  0
 drivers/media/{video => usb}/sn9c102/Kconfig       |  0
 drivers/media/{video => usb}/sn9c102/Makefile      |  0
 drivers/media/{video => usb}/sn9c102/sn9c102.h     |  0
 .../media/{video => usb}/sn9c102/sn9c102_config.h  |  0
 .../media/{video => usb}/sn9c102/sn9c102_core.c    |  0
 .../{video => usb}/sn9c102/sn9c102_devtable.h      |  0
 .../media/{video => usb}/sn9c102/sn9c102_hv7131d.c |  0
 .../media/{video => usb}/sn9c102/sn9c102_hv7131r.c |  0
 .../media/{video => usb}/sn9c102/sn9c102_mi0343.c  |  0
 .../media/{video => usb}/sn9c102/sn9c102_mi0360.c  |  0
 .../media/{video => usb}/sn9c102/sn9c102_mt9v111.c |  0
 .../media/{video => usb}/sn9c102/sn9c102_ov7630.c  |  0
 .../media/{video => usb}/sn9c102/sn9c102_ov7660.c  |  0
 .../media/{video => usb}/sn9c102/sn9c102_pas106b.c |  0
 .../{video => usb}/sn9c102/sn9c102_pas202bcb.c     |  0
 .../media/{video => usb}/sn9c102/sn9c102_sensor.h  |  0
 .../{video => usb}/sn9c102/sn9c102_tas5110c1b.c    |  0
 .../{video => usb}/sn9c102/sn9c102_tas5110d.c      |  0
 .../{video => usb}/sn9c102/sn9c102_tas5130d1b.c    |  0
 drivers/media/{video => usb}/stk1160/Kconfig       |  0
 drivers/media/{video => usb}/stk1160/Makefile      |  0
 .../media/{video => usb}/stk1160/stk1160-ac97.c    |  0
 .../media/{video => usb}/stk1160/stk1160-core.c    |  0
 drivers/media/{video => usb}/stk1160/stk1160-i2c.c |  0
 drivers/media/{video => usb}/stk1160/stk1160-reg.h |  0
 drivers/media/{video => usb}/stk1160/stk1160-v4l.c |  0
 .../media/{video => usb}/stk1160/stk1160-video.c   |  0
 drivers/media/{video => usb}/stk1160/stk1160.h     |  0
 drivers/media/usb/stkwebcam/Kconfig                | 13 ++++
 drivers/media/usb/stkwebcam/Makefile               |  4 +
 .../media/{video => usb/stkwebcam}/stk-sensor.c    |  0
 .../media/{video => usb/stkwebcam}/stk-webcam.c    |  0
 .../media/{video => usb/stkwebcam}/stk-webcam.h    |  0
 drivers/media/{video => usb}/tlg2300/Kconfig       |  0
 drivers/media/{video => usb}/tlg2300/Makefile      |  0
 drivers/media/{video => usb}/tlg2300/pd-alsa.c     |  0
 drivers/media/{video => usb}/tlg2300/pd-common.h   |  0
 drivers/media/{video => usb}/tlg2300/pd-dvb.c      |  0
 drivers/media/{video => usb}/tlg2300/pd-main.c     |  0
 drivers/media/{video => usb}/tlg2300/pd-radio.c    |  0
 drivers/media/{video => usb}/tlg2300/pd-video.c    |  0
 drivers/media/{video => usb}/tlg2300/vendorcmds.h  |  0
 drivers/media/{video => usb}/tm6000/Kconfig        |  0
 drivers/media/{video => usb}/tm6000/Makefile       |  0
 drivers/media/{video => usb}/tm6000/tm6000-alsa.c  |  0
 drivers/media/{video => usb}/tm6000/tm6000-cards.c |  0
 drivers/media/{video => usb}/tm6000/tm6000-core.c  |  0
 drivers/media/{video => usb}/tm6000/tm6000-dvb.c   |  0
 drivers/media/{video => usb}/tm6000/tm6000-i2c.c   |  0
 drivers/media/{video => usb}/tm6000/tm6000-input.c |  0
 drivers/media/{video => usb}/tm6000/tm6000-regs.h  |  0
 drivers/media/{video => usb}/tm6000/tm6000-stds.c  |  0
 .../media/{video => usb}/tm6000/tm6000-usb-isoc.h  |  0
 drivers/media/{video => usb}/tm6000/tm6000-video.c |  0
 drivers/media/{video => usb}/tm6000/tm6000.h       |  0
 drivers/media/{video => usb}/usbvision/Kconfig     |  0
 drivers/media/{video => usb}/usbvision/Makefile    |  0
 .../{video => usb}/usbvision/usbvision-cards.c     |  0
 .../{video => usb}/usbvision/usbvision-cards.h     |  0
 .../{video => usb}/usbvision/usbvision-core.c      |  0
 .../media/{video => usb}/usbvision/usbvision-i2c.c |  0
 .../{video => usb}/usbvision/usbvision-video.c     |  0
 drivers/media/{video => usb}/usbvision/usbvision.h |  0
 drivers/media/{video => usb}/uvc/Kconfig           |  0
 drivers/media/{video => usb}/uvc/Makefile          |  0
 drivers/media/{video => usb}/uvc/uvc_ctrl.c        |  0
 drivers/media/{video => usb}/uvc/uvc_debugfs.c     |  0
 drivers/media/{video => usb}/uvc/uvc_driver.c      |  0
 drivers/media/{video => usb}/uvc/uvc_entity.c      |  0
 drivers/media/{video => usb}/uvc/uvc_isight.c      |  0
 drivers/media/{video => usb}/uvc/uvc_queue.c       |  0
 drivers/media/{video => usb}/uvc/uvc_status.c      |  0
 drivers/media/{video => usb}/uvc/uvc_v4l2.c        |  0
 drivers/media/{video => usb}/uvc/uvc_video.c       |  0
 drivers/media/{video => usb}/uvc/uvcvideo.h        |  0
 drivers/media/usb/zr364xx/Kconfig                  | 14 ++++
 drivers/media/usb/zr364xx/Makefile                 |  2 +
 drivers/media/{video => usb/zr364xx}/zr364xx.c     |  0
 drivers/media/video/Kconfig                        | 91 ----------------------
 drivers/media/video/Makefile                       | 24 ------
 298 files changed, 106 insertions(+), 143 deletions(-)
 rename drivers/media/{video => usb}/au0828/Kconfig (100%)
 rename drivers/media/{video => usb}/au0828/Makefile (100%)
 rename drivers/media/{video => usb}/au0828/au0828-cards.c (100%)
 rename drivers/media/{video => usb}/au0828/au0828-cards.h (100%)
 rename drivers/media/{video => usb}/au0828/au0828-core.c (100%)
 rename drivers/media/{video => usb}/au0828/au0828-dvb.c (100%)
 rename drivers/media/{video => usb}/au0828/au0828-i2c.c (100%)
 rename drivers/media/{video => usb}/au0828/au0828-reg.h (100%)
 rename drivers/media/{video => usb}/au0828/au0828-vbi.c (100%)
 rename drivers/media/{video => usb}/au0828/au0828-video.c (100%)
 rename drivers/media/{video => usb}/au0828/au0828.h (100%)
 rename drivers/media/{video => usb}/cpia2/Kconfig (100%)
 rename drivers/media/{video => usb}/cpia2/Makefile (100%)
 rename drivers/media/{video => usb}/cpia2/cpia2.h (100%)
 rename drivers/media/{video => usb}/cpia2/cpia2_core.c (100%)
 rename drivers/media/{video => usb}/cpia2/cpia2_registers.h (100%)
 rename drivers/media/{video => usb}/cpia2/cpia2_usb.c (100%)
 rename drivers/media/{video => usb}/cpia2/cpia2_v4l.c (100%)
 rename drivers/media/{video => usb}/cx231xx/Kconfig (100%)
 rename drivers/media/{video => usb}/cx231xx/Makefile (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-417.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-audio.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-avcore.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-cards.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-conf-reg.h (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-core.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-dif.h (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-input.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-reg.h (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx-video.c (100%)
 rename drivers/media/{video => usb}/cx231xx/cx231xx.h (100%)
 rename drivers/media/{video => usb}/em28xx/Kconfig (100%)
 rename drivers/media/{video => usb}/em28xx/Makefile (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-audio.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-cards.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-core.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-dvb.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-i2c.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-input.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-reg.h (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-vbi.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx-video.c (100%)
 rename drivers/media/{video => usb}/em28xx/em28xx.h (100%)
 rename drivers/media/{video => usb}/gspca/Kconfig (98%)
 rename drivers/media/{video => usb}/gspca/Makefile (100%)
 rename drivers/media/{video => usb}/gspca/autogain_functions.c (100%)
 rename drivers/media/{video => usb}/gspca/autogain_functions.h (100%)
 rename drivers/media/{video => usb}/gspca/benq.c (100%)
 rename drivers/media/{video => usb}/gspca/conex.c (100%)
 rename drivers/media/{video => usb}/gspca/cpia1.c (100%)
 rename drivers/media/{video => usb}/gspca/etoms.c (100%)
 rename drivers/media/{video => usb}/gspca/finepix.c (100%)
 rename drivers/media/{video => usb}/gspca/gl860/Kconfig (100%)
 rename drivers/media/{video => usb}/gspca/gl860/Makefile (75%)
 rename drivers/media/{video => usb}/gspca/gl860/gl860-mi1320.c (100%)
 rename drivers/media/{video => usb}/gspca/gl860/gl860-mi2020.c (100%)
 rename drivers/media/{video => usb}/gspca/gl860/gl860-ov2640.c (100%)
 rename drivers/media/{video => usb}/gspca/gl860/gl860-ov9655.c (100%)
 rename drivers/media/{video => usb}/gspca/gl860/gl860.c (100%)
 rename drivers/media/{video => usb}/gspca/gl860/gl860.h (100%)
 rename drivers/media/{video => usb}/gspca/gspca.c (100%)
 rename drivers/media/{video => usb}/gspca/gspca.h (100%)
 rename drivers/media/{video => usb}/gspca/jeilinj.c (100%)
 rename drivers/media/{video => usb}/gspca/jl2005bcd.c (100%)
 rename drivers/media/{video => usb}/gspca/jpeg.h (100%)
 rename drivers/media/{video => usb}/gspca/kinect.c (100%)
 rename drivers/media/{video => usb}/gspca/konica.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/Kconfig (100%)
 rename drivers/media/{video => usb}/gspca/m5602/Makefile (80%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_bridge.h (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_core.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.h (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.h (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.h (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.h (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.h (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.c (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.h (100%)
 rename drivers/media/{video => usb}/gspca/m5602/m5602_sensor.h (100%)
 rename drivers/media/{video => usb}/gspca/mars.c (100%)
 rename drivers/media/{video => usb}/gspca/mr97310a.c (100%)
 rename drivers/media/{video => usb}/gspca/nw80x.c (100%)
 rename drivers/media/{video => usb}/gspca/ov519.c (100%)
 rename drivers/media/{video => usb}/gspca/ov534.c (100%)
 rename drivers/media/{video => usb}/gspca/ov534_9.c (100%)
 rename drivers/media/{video => usb}/gspca/pac207.c (100%)
 rename drivers/media/{video => usb}/gspca/pac7302.c (100%)
 rename drivers/media/{video => usb}/gspca/pac7311.c (100%)
 rename drivers/media/{video => usb}/gspca/pac_common.h (100%)
 rename drivers/media/{video => usb}/gspca/se401.c (100%)
 rename drivers/media/{video => usb}/gspca/se401.h (100%)
 rename drivers/media/{video => usb}/gspca/sn9c2028.c (100%)
 rename drivers/media/{video => usb}/gspca/sn9c2028.h (100%)
 rename drivers/media/{video => usb}/gspca/sn9c20x.c (100%)
 rename drivers/media/{video => usb}/gspca/sonixb.c (100%)
 rename drivers/media/{video => usb}/gspca/sonixj.c (100%)
 rename drivers/media/{video => usb}/gspca/spca1528.c (100%)
 rename drivers/media/{video => usb}/gspca/spca500.c (100%)
 rename drivers/media/{video => usb}/gspca/spca501.c (100%)
 rename drivers/media/{video => usb}/gspca/spca505.c (100%)
 rename drivers/media/{video => usb}/gspca/spca506.c (100%)
 rename drivers/media/{video => usb}/gspca/spca508.c (100%)
 rename drivers/media/{video => usb}/gspca/spca561.c (100%)
 rename drivers/media/{video => usb}/gspca/sq905.c (100%)
 rename drivers/media/{video => usb}/gspca/sq905c.c (100%)
 rename drivers/media/{video => usb}/gspca/sq930x.c (100%)
 rename drivers/media/{video => usb}/gspca/stk014.c (100%)
 rename drivers/media/{video => usb}/gspca/stv0680.c (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/Kconfig (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/Makefile (78%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.c (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.h (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.c (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.h (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.c (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.h (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_sensor.h (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.c (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.h (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.c (100%)
 rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.h (100%)
 rename drivers/media/{video => usb}/gspca/sunplus.c (100%)
 rename drivers/media/{video => usb}/gspca/t613.c (100%)
 rename drivers/media/{video => usb}/gspca/topro.c (100%)
 rename drivers/media/{video => usb}/gspca/tv8532.c (100%)
 rename drivers/media/{video => usb}/gspca/vc032x.c (100%)
 rename drivers/media/{video => usb}/gspca/vicam.c (100%)
 rename drivers/media/{video => usb}/gspca/w996Xcf.c (100%)
 rename drivers/media/{video => usb}/gspca/xirlink_cit.c (100%)
 rename drivers/media/{video => usb}/gspca/zc3xx-reg.h (100%)
 rename drivers/media/{video => usb}/gspca/zc3xx.c (100%)
 rename drivers/media/{video => usb}/hdpvr/Kconfig (100%)
 rename drivers/media/{video => usb}/hdpvr/Makefile (100%)
 rename drivers/media/{video => usb}/hdpvr/hdpvr-control.c (100%)
 rename drivers/media/{video => usb}/hdpvr/hdpvr-core.c (100%)
 rename drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c (100%)
 rename drivers/media/{video => usb}/hdpvr/hdpvr-video.c (100%)
 rename drivers/media/{video => usb}/hdpvr/hdpvr.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/Kconfig (100%)
 rename drivers/media/{video => usb}/pvrusb2/Makefile (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debug.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw-internal.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-main.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-util.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.c (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.h (100%)
 rename drivers/media/{video => usb}/pvrusb2/pvrusb2.h (100%)
 rename drivers/media/{video => usb}/pwc/Kconfig (100%)
 rename drivers/media/{video => usb}/pwc/Makefile (100%)
 rename drivers/media/{video => usb}/pwc/philips.txt (100%)
 rename drivers/media/{video => usb}/pwc/pwc-ctrl.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-dec1.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-dec1.h (100%)
 rename drivers/media/{video => usb}/pwc/pwc-dec23.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-dec23.h (100%)
 rename drivers/media/{video => usb}/pwc/pwc-if.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-kiara.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-kiara.h (100%)
 rename drivers/media/{video => usb}/pwc/pwc-misc.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-nala.h (100%)
 rename drivers/media/{video => usb}/pwc/pwc-timon.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-timon.h (100%)
 rename drivers/media/{video => usb}/pwc/pwc-uncompress.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc-v4l.c (100%)
 rename drivers/media/{video => usb}/pwc/pwc.h (100%)
 rename drivers/media/{video => usb/s2255}/s2255drv.c (100%)
 rename drivers/media/{video => usb}/sn9c102/Kconfig (100%)
 rename drivers/media/{video => usb}/sn9c102/Makefile (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102.h (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_config.h (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_core.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_devtable.h (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131d.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131r.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0343.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0360.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_mt9v111.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7630.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7660.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_pas106b.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_pas202bcb.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_sensor.h (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110c1b.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110d.c (100%)
 rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5130d1b.c (100%)
 rename drivers/media/{video => usb}/stk1160/Kconfig (100%)
 rename drivers/media/{video => usb}/stk1160/Makefile (100%)
 rename drivers/media/{video => usb}/stk1160/stk1160-ac97.c (100%)
 rename drivers/media/{video => usb}/stk1160/stk1160-core.c (100%)
 rename drivers/media/{video => usb}/stk1160/stk1160-i2c.c (100%)
 rename drivers/media/{video => usb}/stk1160/stk1160-reg.h (100%)
 rename drivers/media/{video => usb}/stk1160/stk1160-v4l.c (100%)
 rename drivers/media/{video => usb}/stk1160/stk1160-video.c (100%)
 rename drivers/media/{video => usb}/stk1160/stk1160.h (100%)
 create mode 100644 drivers/media/usb/stkwebcam/Kconfig
 create mode 100644 drivers/media/usb/stkwebcam/Makefile
 rename drivers/media/{video => usb/stkwebcam}/stk-sensor.c (100%)
 rename drivers/media/{video => usb/stkwebcam}/stk-webcam.c (100%)
 rename drivers/media/{video => usb/stkwebcam}/stk-webcam.h (100%)
 rename drivers/media/{video => usb}/tlg2300/Kconfig (100%)
 rename drivers/media/{video => usb}/tlg2300/Makefile (100%)
 rename drivers/media/{video => usb}/tlg2300/pd-alsa.c (100%)
 rename drivers/media/{video => usb}/tlg2300/pd-common.h (100%)
 rename drivers/media/{video => usb}/tlg2300/pd-dvb.c (100%)
 rename drivers/media/{video => usb}/tlg2300/pd-main.c (100%)
 rename drivers/media/{video => usb}/tlg2300/pd-radio.c (100%)
 rename drivers/media/{video => usb}/tlg2300/pd-video.c (100%)
 rename drivers/media/{video => usb}/tlg2300/vendorcmds.h (100%)
 rename drivers/media/{video => usb}/tm6000/Kconfig (100%)
 rename drivers/media/{video => usb}/tm6000/Makefile (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-alsa.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-cards.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-core.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-dvb.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-i2c.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-input.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-regs.h (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-stds.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-usb-isoc.h (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000-video.c (100%)
 rename drivers/media/{video => usb}/tm6000/tm6000.h (100%)
 rename drivers/media/{video => usb}/usbvision/Kconfig (100%)
 rename drivers/media/{video => usb}/usbvision/Makefile (100%)
 rename drivers/media/{video => usb}/usbvision/usbvision-cards.c (100%)
 rename drivers/media/{video => usb}/usbvision/usbvision-cards.h (100%)
 rename drivers/media/{video => usb}/usbvision/usbvision-core.c (100%)
 rename drivers/media/{video => usb}/usbvision/usbvision-i2c.c (100%)
 rename drivers/media/{video => usb}/usbvision/usbvision-video.c (100%)
 rename drivers/media/{video => usb}/usbvision/usbvision.h (100%)
 rename drivers/media/{video => usb}/uvc/Kconfig (100%)
 rename drivers/media/{video => usb}/uvc/Makefile (100%)
 rename drivers/media/{video => usb}/uvc/uvc_ctrl.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_debugfs.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_driver.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_entity.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_isight.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_queue.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_status.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_v4l2.c (100%)
 rename drivers/media/{video => usb}/uvc/uvc_video.c (100%)
 rename drivers/media/{video => usb}/uvc/uvcvideo.h (100%)
 create mode 100644 drivers/media/usb/zr364xx/Kconfig
 create mode 100644 drivers/media/usb/zr364xx/Makefile
 rename drivers/media/{video => usb/zr364xx}/zr364xx.c (100%)

-- 
1.7.11.2

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to