diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-02 00:23:55 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 09:59:03 (GMT) |
commit | 4860c73804c6e7ef8e69f98958489bb2bea6f6d2 (patch) | |
tree | 6d8dc4ca7794478274e011e5fae4fd1005cf6877 /drivers/staging | |
parent | d6ce55de3abcc4910fef1d79212a17480c154704 (diff) | |
download | linux-4860c73804c6e7ef8e69f98958489bb2bea6f6d2.tar.xz |
staging: Move media drivers to staging/media
In practice, it is being hard to distinguish when a patch
should go to staging tree or to the media tree. Better
to distinguish it, by putting the media drivers at a
separate staging directory. Newer staging drivers that include
anything with "dvb*.h", "v4l2*.h" or "videodev2.h" should
go to the drivers/staging/media tree.
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/Kconfig | 14 | ||||
-rw-r--r-- | drivers/staging/Makefile | 8 | ||||
-rw-r--r-- | drivers/staging/media/Kconfig | 37 | ||||
-rw-r--r-- | drivers/staging/media/Makefile | 7 | ||||
-rw-r--r-- | drivers/staging/media/cxd2099/Kconfig (renamed from drivers/staging/cxd2099/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/media/cxd2099/Makefile (renamed from drivers/staging/cxd2099/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/media/cxd2099/TODO (renamed from drivers/staging/cxd2099/TODO) | 0 | ||||
-rw-r--r-- | drivers/staging/media/cxd2099/cxd2099.c (renamed from drivers/staging/cxd2099/cxd2099.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/cxd2099/cxd2099.h (renamed from drivers/staging/cxd2099/cxd2099.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/dt3155v4l/Kconfig (renamed from drivers/staging/dt3155v4l/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/media/dt3155v4l/Makefile (renamed from drivers/staging/dt3155v4l/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.c (renamed from drivers/staging/dt3155v4l/dt3155v4l.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.h (renamed from drivers/staging/dt3155v4l/dt3155v4l.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/Kconfig (renamed from drivers/staging/easycap/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/Makefile (renamed from drivers/staging/easycap/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/README (renamed from drivers/staging/easycap/README) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/easycap.h (renamed from drivers/staging/easycap/easycap.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/easycap_ioctl.c (renamed from drivers/staging/easycap/easycap_ioctl.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/easycap_low.c (renamed from drivers/staging/easycap/easycap_low.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/easycap_main.c (renamed from drivers/staging/easycap/easycap_main.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/easycap_settings.c (renamed from drivers/staging/easycap/easycap_settings.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/easycap_sound.c (renamed from drivers/staging/easycap/easycap_sound.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/easycap/easycap_testcard.c (renamed from drivers/staging/easycap/easycap_testcard.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/Kconfig (renamed from drivers/staging/go7007/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/Makefile (renamed from drivers/staging/go7007/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/README (renamed from drivers/staging/go7007/README) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007-driver.c (renamed from drivers/staging/go7007/go7007-driver.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007-fw.c (renamed from drivers/staging/go7007/go7007-fw.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007-i2c.c (renamed from drivers/staging/go7007/go7007-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007-priv.h (renamed from drivers/staging/go7007/go7007-priv.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007-usb.c (renamed from drivers/staging/go7007/go7007-usb.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007-v4l2.c (renamed from drivers/staging/go7007/go7007-v4l2.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007.h (renamed from drivers/staging/go7007/go7007.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/go7007.txt (renamed from drivers/staging/go7007/go7007.txt) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/s2250-board.c (renamed from drivers/staging/go7007/s2250-board.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/s2250-loader.c (renamed from drivers/staging/go7007/s2250-loader.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/s2250-loader.h (renamed from drivers/staging/go7007/s2250-loader.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/saa7134-go7007.c (renamed from drivers/staging/go7007/saa7134-go7007.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/snd-go7007.c (renamed from drivers/staging/go7007/snd-go7007.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-i2c.h (renamed from drivers/staging/go7007/wis-i2c.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-ov7640.c (renamed from drivers/staging/go7007/wis-ov7640.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-saa7113.c (renamed from drivers/staging/go7007/wis-saa7113.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-saa7115.c (renamed from drivers/staging/go7007/wis-saa7115.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-sony-tuner.c (renamed from drivers/staging/go7007/wis-sony-tuner.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-tw2804.c (renamed from drivers/staging/go7007/wis-tw2804.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-tw9903.c (renamed from drivers/staging/go7007/wis-tw9903.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/go7007/wis-uda1342.c (renamed from drivers/staging/go7007/wis-uda1342.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/Kconfig (renamed from drivers/staging/lirc/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/Makefile (renamed from drivers/staging/lirc/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/TODO (renamed from drivers/staging/lirc/TODO) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/TODO.lirc_zilog (renamed from drivers/staging/lirc/TODO.lirc_zilog) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_bt829.c (renamed from drivers/staging/lirc/lirc_bt829.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_ene0100.h (renamed from drivers/staging/lirc/lirc_ene0100.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_igorplugusb.c (renamed from drivers/staging/lirc/lirc_igorplugusb.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_imon.c (renamed from drivers/staging/lirc/lirc_imon.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_parallel.c (renamed from drivers/staging/lirc/lirc_parallel.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_parallel.h (renamed from drivers/staging/lirc/lirc_parallel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_sasem.c (renamed from drivers/staging/lirc/lirc_sasem.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_serial.c (renamed from drivers/staging/lirc/lirc_serial.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_sir.c (renamed from drivers/staging/lirc/lirc_sir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_ttusbir.c (renamed from drivers/staging/lirc/lirc_ttusbir.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/lirc/lirc_zilog.c (renamed from drivers/staging/lirc/lirc_zilog.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/Kconfig (renamed from drivers/staging/solo6x10/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/Makefile (renamed from drivers/staging/solo6x10/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/TODO (renamed from drivers/staging/solo6x10/TODO) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/core.c (renamed from drivers/staging/solo6x10/core.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/disp.c (renamed from drivers/staging/solo6x10/disp.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/enc.c (renamed from drivers/staging/solo6x10/enc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/g723.c (renamed from drivers/staging/solo6x10/g723.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/gpio.c (renamed from drivers/staging/solo6x10/gpio.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/i2c.c (renamed from drivers/staging/solo6x10/i2c.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/jpeg.h (renamed from drivers/staging/solo6x10/jpeg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/offsets.h (renamed from drivers/staging/solo6x10/offsets.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/osd-font.h (renamed from drivers/staging/solo6x10/osd-font.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/p2m.c (renamed from drivers/staging/solo6x10/p2m.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/registers.h (renamed from drivers/staging/solo6x10/registers.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/solo6x10.h (renamed from drivers/staging/solo6x10/solo6x10.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/tw28.c (renamed from drivers/staging/solo6x10/tw28.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/tw28.h (renamed from drivers/staging/solo6x10/tw28.h) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/v4l2-enc.c (renamed from drivers/staging/solo6x10/v4l2-enc.c) | 0 | ||||
-rw-r--r-- | drivers/staging/media/solo6x10/v4l2.c (renamed from drivers/staging/solo6x10/v4l2.c) | 0 |
81 files changed, 46 insertions, 20 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 39df859..25cdff3 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -30,10 +30,6 @@ source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" -source "drivers/staging/go7007/Kconfig" - -source "drivers/staging/cxd2099/Kconfig" - source "drivers/staging/usbip/Kconfig" source "drivers/staging/winbond/Kconfig" @@ -102,20 +98,12 @@ source "drivers/staging/wlags49_h25/Kconfig" source "drivers/staging/sm7xx/Kconfig" -source "drivers/staging/dt3155v4l/Kconfig" - source "drivers/staging/crystalhd/Kconfig" source "drivers/staging/cxt1e1/Kconfig" source "drivers/staging/xgifb/Kconfig" -source "drivers/staging/lirc/Kconfig" - -source "drivers/staging/easycap/Kconfig" - -source "drivers/staging/solo6x10/Kconfig" - source "drivers/staging/tidspbridge/Kconfig" source "drivers/staging/quickstart/Kconfig" @@ -142,6 +130,6 @@ source "drivers/staging/mei/Kconfig" source "drivers/staging/nvec/Kconfig" -source "drivers/staging/media/as102/Kconfig" +source "drivers/staging/media/Kconfig" endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index cd1bcc1..a25f3f2 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -4,11 +4,9 @@ obj-$(CONFIG_STAGING) += staging.o obj-y += serial/ +obj-y += media/ obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/ -obj-$(CONFIG_VIDEO_GO7007) += go7007/ -obj-$(CONFIG_DVB_CXD2099) += cxd2099/ -obj-$(CONFIG_LIRC_STAGING) += lirc/ obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ @@ -43,12 +41,9 @@ obj-$(CONFIG_ZCACHE) += zcache/ obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/ obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/ obj-$(CONFIG_FB_SM7XX) += sm7xx/ -obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ obj-$(CONFIG_CRYSTALHD) += crystalhd/ obj-$(CONFIG_CXT1E1) += cxt1e1/ obj-$(CONFIG_FB_XGI) += xgifb/ -obj-$(CONFIG_EASYCAP) += easycap/ -obj-$(CONFIG_SOLO6X10) += solo6x10/ obj-$(CONFIG_TIDSPBRIDGE) += tidspbridge/ obj-$(CONFIG_ACPI_QUICKSTART) += quickstart/ obj-$(CONFIG_SBE_2T3E3) += sbe-2t3e3/ @@ -62,4 +57,3 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ obj-$(CONFIG_DRM_PSB) += gma500/ obj-$(CONFIG_INTEL_MEI) += mei/ obj-$(CONFIG_MFD_NVEC) += nvec/ -obj-$(CONFIG_DVB_AS102) += media/as102/ diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig new file mode 100644 index 0000000..7e5caa3 --- /dev/null +++ b/drivers/staging/media/Kconfig @@ -0,0 +1,37 @@ +menuconfig STAGING_MEDIA + bool "Media staging drivers" + default n + ---help--- + This option allows you to select a number of media drivers that + don't have the "normal" Linux kernel quality level. + Most of them don't follow properly the V4L, DVB and/or RC API's, + so, they won't likely work fine with the existing applications. + That also means that, one fixed, their API's will change to match + the existing ones. + + If you wish to work on these drivers, to help improve them, or + to report problems you have with them, please use the + linux-media@vger.kernel.org mailing list. + + If in doubt, say N here. + + +if STAGING_MEDIA + +# Please keep them in alphabetic order +source "drivers/staging/media/as102/Kconfig" + +source "drivers/staging/media/cxd2099/Kconfig" + +source "drivers/staging/media/dt3155v4l/Kconfig" + +source "drivers/staging/media/easycap/Kconfig" + +source "drivers/staging/media/go7007/Kconfig" + +source "drivers/staging/media/solo6x10/Kconfig" + +# Keep LIRC at the end, as it has sub-menus +source "drivers/staging/media/lirc/Kconfig" + +endif diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile new file mode 100644 index 0000000..c69124c --- /dev/null +++ b/drivers/staging/media/Makefile @@ -0,0 +1,7 @@ +obj-$(CONFIG_DVB_AS102) += as102/ +obj-$(CONFIG_DVB_CXD2099) += cxd2099/ +obj-$(CONFIG_EASYCAP) += easycap/ +obj-$(CONFIG_LIRC_STAGING) += lirc/ +obj-$(CONFIG_SOLO6X10) += solo6x10/ +obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ +obj-$(CONFIG_VIDEO_GO7007) += go7007/ diff --git a/drivers/staging/cxd2099/Kconfig b/drivers/staging/media/cxd2099/Kconfig index b48aefd..b48aefd 100644 --- a/drivers/staging/cxd2099/Kconfig +++ b/drivers/staging/media/cxd2099/Kconfig diff --git a/drivers/staging/cxd2099/Makefile b/drivers/staging/media/cxd2099/Makefile index 64cfc77..64cfc77 100644 --- a/drivers/staging/cxd2099/Makefile +++ b/drivers/staging/media/cxd2099/Makefile diff --git a/drivers/staging/cxd2099/TODO b/drivers/staging/media/cxd2099/TODO index 375bb6f..375bb6f 100644 --- a/drivers/staging/cxd2099/TODO +++ b/drivers/staging/media/cxd2099/TODO diff --git a/drivers/staging/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c index 1c04185..1c04185 100644 --- a/drivers/staging/cxd2099/cxd2099.c +++ b/drivers/staging/media/cxd2099/cxd2099.c diff --git a/drivers/staging/cxd2099/cxd2099.h b/drivers/staging/media/cxd2099/cxd2099.h index 19c588a..19c588a 100644 --- a/drivers/staging/cxd2099/cxd2099.h +++ b/drivers/staging/media/cxd2099/cxd2099.h diff --git a/drivers/staging/dt3155v4l/Kconfig b/drivers/staging/media/dt3155v4l/Kconfig index 226a1ca..226a1ca 100644 --- a/drivers/staging/dt3155v4l/Kconfig +++ b/drivers/staging/media/dt3155v4l/Kconfig diff --git a/drivers/staging/dt3155v4l/Makefile b/drivers/staging/media/dt3155v4l/Makefile index ce7a3ec..ce7a3ec 100644 --- a/drivers/staging/dt3155v4l/Makefile +++ b/drivers/staging/media/dt3155v4l/Makefile diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c index 04e93c4..04e93c4 100644 --- a/drivers/staging/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c diff --git a/drivers/staging/dt3155v4l/dt3155v4l.h b/drivers/staging/media/dt3155v4l/dt3155v4l.h index 2e4f89d..2e4f89d 100644 --- a/drivers/staging/dt3155v4l/dt3155v4l.h +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.h diff --git a/drivers/staging/easycap/Kconfig b/drivers/staging/media/easycap/Kconfig index a425a6f..a425a6f 100644 --- a/drivers/staging/easycap/Kconfig +++ b/drivers/staging/media/easycap/Kconfig diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/media/easycap/Makefile index a34e75f..a34e75f 100644 --- a/drivers/staging/easycap/Makefile +++ b/drivers/staging/media/easycap/Makefile diff --git a/drivers/staging/easycap/README b/drivers/staging/media/easycap/README index 796b032..796b032 100644 --- a/drivers/staging/easycap/README +++ b/drivers/staging/media/easycap/README diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/media/easycap/easycap.h index 7b256a9..7b256a9 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/media/easycap/easycap.h diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/media/easycap/easycap_ioctl.c index c99addf..c99addf 100644 --- a/drivers/staging/easycap/easycap_ioctl.c +++ b/drivers/staging/media/easycap/easycap_ioctl.c diff --git a/drivers/staging/easycap/easycap_low.c b/drivers/staging/media/easycap/easycap_low.c index 0385735..0385735 100644 --- a/drivers/staging/easycap/easycap_low.c +++ b/drivers/staging/media/easycap/easycap_low.c diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c index a45c0b5..a45c0b5 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/drivers/staging/media/easycap/easycap_main.c diff --git a/drivers/staging/easycap/easycap_settings.c b/drivers/staging/media/easycap/easycap_settings.c index 70f59b1..70f59b1 100644 --- a/drivers/staging/easycap/easycap_settings.c +++ b/drivers/staging/media/easycap/easycap_settings.c diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/media/easycap/easycap_sound.c index b22bb39..b22bb39 100644 --- a/drivers/staging/easycap/easycap_sound.c +++ b/drivers/staging/media/easycap/easycap_sound.c diff --git a/drivers/staging/easycap/easycap_testcard.c b/drivers/staging/media/easycap/easycap_testcard.c index 0f71470..0f71470 100644 --- a/drivers/staging/easycap/easycap_testcard.c +++ b/drivers/staging/media/easycap/easycap_testcard.c diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/media/go7007/Kconfig index 7dfb281..7dfb281 100644 --- a/drivers/staging/go7007/Kconfig +++ b/drivers/staging/media/go7007/Kconfig diff --git a/drivers/staging/go7007/Makefile b/drivers/staging/media/go7007/Makefile index 6ee837c..6ee837c 100644 --- a/drivers/staging/go7007/Makefile +++ b/drivers/staging/media/go7007/Makefile diff --git a/drivers/staging/go7007/README b/drivers/staging/media/go7007/README index 48f4476..48f4476 100644 --- a/drivers/staging/go7007/README +++ b/drivers/staging/media/go7007/README diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/media/go7007/go7007-driver.c index 6c9279a..6c9279a 100644 --- a/drivers/staging/go7007/go7007-driver.c +++ b/drivers/staging/media/go7007/go7007-driver.c diff --git a/drivers/staging/go7007/go7007-fw.c b/drivers/staging/media/go7007/go7007-fw.c index c9a6409..c9a6409 100644 --- a/drivers/staging/go7007/go7007-fw.c +++ b/drivers/staging/media/go7007/go7007-fw.c diff --git a/drivers/staging/go7007/go7007-i2c.c b/drivers/staging/media/go7007/go7007-i2c.c index b8cfa1a..b8cfa1a 100644 --- a/drivers/staging/go7007/go7007-i2c.c +++ b/drivers/staging/media/go7007/go7007-i2c.c diff --git a/drivers/staging/go7007/go7007-priv.h b/drivers/staging/media/go7007/go7007-priv.h index b58c394..b58c394 100644 --- a/drivers/staging/go7007/go7007-priv.h +++ b/drivers/staging/media/go7007/go7007-priv.h diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c index 3db3b0a..3db3b0a 100644 --- a/drivers/staging/go7007/go7007-usb.c +++ b/drivers/staging/media/go7007/go7007-usb.c diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c index 2b27d8d..2b27d8d 100644 --- a/drivers/staging/go7007/go7007-v4l2.c +++ b/drivers/staging/media/go7007/go7007-v4l2.c diff --git a/drivers/staging/go7007/go7007.h b/drivers/staging/media/go7007/go7007.h index 7399c91..7399c91 100644 --- a/drivers/staging/go7007/go7007.h +++ b/drivers/staging/media/go7007/go7007.h diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/media/go7007/go7007.txt index 9db1f39..9db1f39 100644 --- a/drivers/staging/go7007/go7007.txt +++ b/drivers/staging/media/go7007/go7007.txt diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/media/go7007/s2250-board.c index e7736a9..e7736a9 100644 --- a/drivers/staging/go7007/s2250-board.c +++ b/drivers/staging/media/go7007/s2250-board.c diff --git a/drivers/staging/go7007/s2250-loader.c b/drivers/staging/media/go7007/s2250-loader.c index 4e13251..4e13251 100644 --- a/drivers/staging/go7007/s2250-loader.c +++ b/drivers/staging/media/go7007/s2250-loader.c diff --git a/drivers/staging/go7007/s2250-loader.h b/drivers/staging/media/go7007/s2250-loader.h index b7c301a..b7c301a 100644 --- a/drivers/staging/go7007/s2250-loader.h +++ b/drivers/staging/media/go7007/s2250-loader.h diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/media/go7007/saa7134-go7007.c index cf7c34a..cf7c34a 100644 --- a/drivers/staging/go7007/saa7134-go7007.c +++ b/drivers/staging/media/go7007/saa7134-go7007.c diff --git a/drivers/staging/go7007/snd-go7007.c b/drivers/staging/media/go7007/snd-go7007.c index deac938..deac938 100644 --- a/drivers/staging/go7007/snd-go7007.c +++ b/drivers/staging/media/go7007/snd-go7007.c diff --git a/drivers/staging/go7007/wis-i2c.h b/drivers/staging/media/go7007/wis-i2c.h index 3c2b9be..3c2b9be 100644 --- a/drivers/staging/go7007/wis-i2c.h +++ b/drivers/staging/media/go7007/wis-i2c.h diff --git a/drivers/staging/go7007/wis-ov7640.c b/drivers/staging/media/go7007/wis-ov7640.c index 6bc9470..6bc9470 100644 --- a/drivers/staging/go7007/wis-ov7640.c +++ b/drivers/staging/media/go7007/wis-ov7640.c diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/media/go7007/wis-saa7113.c index 05e0e10..05e0e10 100644 --- a/drivers/staging/go7007/wis-saa7113.c +++ b/drivers/staging/media/go7007/wis-saa7113.c diff --git a/drivers/staging/go7007/wis-saa7115.c b/drivers/staging/media/go7007/wis-saa7115.c index 46cff59..46cff59 100644 --- a/drivers/staging/go7007/wis-saa7115.c +++ b/drivers/staging/media/go7007/wis-saa7115.c diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/media/go7007/wis-sony-tuner.c index 8f1b7d4..8f1b7d4 100644 --- a/drivers/staging/go7007/wis-sony-tuner.c +++ b/drivers/staging/media/go7007/wis-sony-tuner.c diff --git a/drivers/staging/go7007/wis-tw2804.c b/drivers/staging/media/go7007/wis-tw2804.c index 9134f03..9134f03 100644 --- a/drivers/staging/go7007/wis-tw2804.c +++ b/drivers/staging/media/go7007/wis-tw2804.c diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/media/go7007/wis-tw9903.c index 9230f4a..9230f4a 100644 --- a/drivers/staging/go7007/wis-tw9903.c +++ b/drivers/staging/media/go7007/wis-tw9903.c diff --git a/drivers/staging/go7007/wis-uda1342.c b/drivers/staging/media/go7007/wis-uda1342.c index 0127be2..0127be2 100644 --- a/drivers/staging/go7007/wis-uda1342.c +++ b/drivers/staging/media/go7007/wis-uda1342.c diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/media/lirc/Kconfig index 526ec0f..526ec0f 100644 --- a/drivers/staging/lirc/Kconfig +++ b/drivers/staging/media/lirc/Kconfig diff --git a/drivers/staging/lirc/Makefile b/drivers/staging/media/lirc/Makefile index d76b0fa..d76b0fa 100644 --- a/drivers/staging/lirc/Makefile +++ b/drivers/staging/media/lirc/Makefile diff --git a/drivers/staging/lirc/TODO b/drivers/staging/media/lirc/TODO index b6cb593..b6cb593 100644 --- a/drivers/staging/lirc/TODO +++ b/drivers/staging/media/lirc/TODO diff --git a/drivers/staging/lirc/TODO.lirc_zilog b/drivers/staging/media/lirc/TODO.lirc_zilog index a97800a..a97800a 100644 --- a/drivers/staging/lirc/TODO.lirc_zilog +++ b/drivers/staging/media/lirc/TODO.lirc_zilog diff --git a/drivers/staging/lirc/lirc_bt829.c b/drivers/staging/media/lirc/lirc_bt829.c index c5a0d27..c5a0d27 100644 --- a/drivers/staging/lirc/lirc_bt829.c +++ b/drivers/staging/media/lirc/lirc_bt829.c diff --git a/drivers/staging/lirc/lirc_ene0100.h b/drivers/staging/media/lirc/lirc_ene0100.h index 06bebd6..06bebd6 100644 --- a/drivers/staging/lirc/lirc_ene0100.h +++ b/drivers/staging/media/lirc/lirc_ene0100.h diff --git a/drivers/staging/lirc/lirc_igorplugusb.c b/drivers/staging/media/lirc/lirc_igorplugusb.c index 0dc2c2b..0dc2c2b 100644 --- a/drivers/staging/lirc/lirc_igorplugusb.c +++ b/drivers/staging/media/lirc/lirc_igorplugusb.c diff --git a/drivers/staging/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c index f5308d5..f5308d5 100644 --- a/drivers/staging/lirc/lirc_imon.c +++ b/drivers/staging/media/lirc/lirc_imon.c diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c index 792aac0..792aac0 100644 --- a/drivers/staging/lirc/lirc_parallel.c +++ b/drivers/staging/media/lirc/lirc_parallel.c diff --git a/drivers/staging/lirc/lirc_parallel.h b/drivers/staging/media/lirc/lirc_parallel.h index 4bed6af..4bed6af 100644 --- a/drivers/staging/lirc/lirc_parallel.h +++ b/drivers/staging/media/lirc/lirc_parallel.h diff --git a/drivers/staging/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c index a2d18b0..a2d18b0 100644 --- a/drivers/staging/lirc/lirc_sasem.c +++ b/drivers/staging/media/lirc/lirc_sasem.c diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c index 8a060a8..8a060a8 100644 --- a/drivers/staging/lirc/lirc_serial.c +++ b/drivers/staging/media/lirc/lirc_serial.c diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c index 6903d39..6903d39 100644 --- a/drivers/staging/lirc/lirc_sir.c +++ b/drivers/staging/media/lirc/lirc_sir.c diff --git a/drivers/staging/lirc/lirc_ttusbir.c b/drivers/staging/media/lirc/lirc_ttusbir.c index e4b329b..e4b329b 100644 --- a/drivers/staging/lirc/lirc_ttusbir.c +++ b/drivers/staging/media/lirc/lirc_ttusbir.c diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c index 0302d82..0302d82 100644 --- a/drivers/staging/lirc/lirc_zilog.c +++ b/drivers/staging/media/lirc/lirc_zilog.c diff --git a/drivers/staging/solo6x10/Kconfig b/drivers/staging/media/solo6x10/Kconfig index 03dcac4..03dcac4 100644 --- a/drivers/staging/solo6x10/Kconfig +++ b/drivers/staging/media/solo6x10/Kconfig diff --git a/drivers/staging/solo6x10/Makefile b/drivers/staging/media/solo6x10/Makefile index 72816cf..72816cf 100644 --- a/drivers/staging/solo6x10/Makefile +++ b/drivers/staging/media/solo6x10/Makefile diff --git a/drivers/staging/solo6x10/TODO b/drivers/staging/media/solo6x10/TODO index 7e6c4fa..7e6c4fa 100644 --- a/drivers/staging/solo6x10/TODO +++ b/drivers/staging/media/solo6x10/TODO diff --git a/drivers/staging/solo6x10/core.c b/drivers/staging/media/solo6x10/core.c index f974f64..f974f64 100644 --- a/drivers/staging/solo6x10/core.c +++ b/drivers/staging/media/solo6x10/core.c diff --git a/drivers/staging/solo6x10/disp.c b/drivers/staging/media/solo6x10/disp.c index 884c0eb..884c0eb 100644 --- a/drivers/staging/solo6x10/disp.c +++ b/drivers/staging/media/solo6x10/disp.c diff --git a/drivers/staging/solo6x10/enc.c b/drivers/staging/media/solo6x10/enc.c index de50259..de50259 100644 --- a/drivers/staging/solo6x10/enc.c +++ b/drivers/staging/media/solo6x10/enc.c diff --git a/drivers/staging/solo6x10/g723.c b/drivers/staging/media/solo6x10/g723.c index 59274bf..59274bf 100644 --- a/drivers/staging/solo6x10/g723.c +++ b/drivers/staging/media/solo6x10/g723.c diff --git a/drivers/staging/solo6x10/gpio.c b/drivers/staging/media/solo6x10/gpio.c index 0925e6f..0925e6f 100644 --- a/drivers/staging/solo6x10/gpio.c +++ b/drivers/staging/media/solo6x10/gpio.c diff --git a/drivers/staging/solo6x10/i2c.c b/drivers/staging/media/solo6x10/i2c.c index ef95a50..ef95a50 100644 --- a/drivers/staging/solo6x10/i2c.c +++ b/drivers/staging/media/solo6x10/i2c.c diff --git a/drivers/staging/solo6x10/jpeg.h b/drivers/staging/media/solo6x10/jpeg.h index 50defec..50defec 100644 --- a/drivers/staging/solo6x10/jpeg.h +++ b/drivers/staging/media/solo6x10/jpeg.h diff --git a/drivers/staging/solo6x10/offsets.h b/drivers/staging/media/solo6x10/offsets.h index 3d7e569..3d7e569 100644 --- a/drivers/staging/solo6x10/offsets.h +++ b/drivers/staging/media/solo6x10/offsets.h diff --git a/drivers/staging/solo6x10/osd-font.h b/drivers/staging/media/solo6x10/osd-font.h index 591e0e8..591e0e8 100644 --- a/drivers/staging/solo6x10/osd-font.h +++ b/drivers/staging/media/solo6x10/osd-font.h diff --git a/drivers/staging/solo6x10/p2m.c b/drivers/staging/media/solo6x10/p2m.c index 56210f0..56210f0 100644 --- a/drivers/staging/solo6x10/p2m.c +++ b/drivers/staging/media/solo6x10/p2m.c diff --git a/drivers/staging/solo6x10/registers.h b/drivers/staging/media/solo6x10/registers.h index aca5444..aca5444 100644 --- a/drivers/staging/solo6x10/registers.h +++ b/drivers/staging/media/solo6x10/registers.h diff --git a/drivers/staging/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h index abee721..abee721 100644 --- a/drivers/staging/solo6x10/solo6x10.h +++ b/drivers/staging/media/solo6x10/solo6x10.h diff --git a/drivers/staging/solo6x10/tw28.c b/drivers/staging/media/solo6x10/tw28.c index db56b42..db56b42 100644 --- a/drivers/staging/solo6x10/tw28.c +++ b/drivers/staging/media/solo6x10/tw28.c diff --git a/drivers/staging/solo6x10/tw28.h b/drivers/staging/media/solo6x10/tw28.h index a44a03a..a44a03a 100644 --- a/drivers/staging/solo6x10/tw28.h +++ b/drivers/staging/media/solo6x10/tw28.h diff --git a/drivers/staging/solo6x10/v4l2-enc.c b/drivers/staging/media/solo6x10/v4l2-enc.c index bee7280..bee7280 100644 --- a/drivers/staging/solo6x10/v4l2-enc.c +++ b/drivers/staging/media/solo6x10/v4l2-enc.c diff --git a/drivers/staging/solo6x10/v4l2.c b/drivers/staging/media/solo6x10/v4l2.c index 571c3a3..571c3a3 100644 --- a/drivers/staging/solo6x10/v4l2.c +++ b/drivers/staging/media/solo6x10/v4l2.c |