diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/video/cx25821/Kconfig (renamed from drivers/staging/cx25821/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/Makefile (renamed from drivers/staging/cx25821/Makefile) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-alsa.c (renamed from drivers/staging/cx25821/cx25821-alsa.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-audio-upstream.c (renamed from drivers/staging/cx25821/cx25821-audio-upstream.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-audio-upstream.h (renamed from drivers/staging/cx25821/cx25821-audio-upstream.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-audio.h (renamed from drivers/staging/cx25821/cx25821-audio.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-biffuncs.h (renamed from drivers/staging/cx25821/cx25821-biffuncs.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-cards.c (renamed from drivers/staging/cx25821/cx25821-cards.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-core.c (renamed from drivers/staging/cx25821/cx25821-core.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-gpio.c (renamed from drivers/staging/cx25821/cx25821-gpio.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-i2c.c (renamed from drivers/staging/cx25821/cx25821-i2c.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-medusa-defines.h (renamed from drivers/staging/cx25821/cx25821-medusa-defines.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-medusa-reg.h (renamed from drivers/staging/cx25821/cx25821-medusa-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-medusa-video.c (renamed from drivers/staging/cx25821/cx25821-medusa-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-medusa-video.h (renamed from drivers/staging/cx25821/cx25821-medusa-video.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-reg.h (renamed from drivers/staging/cx25821/cx25821-reg.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-sram.h (renamed from drivers/staging/cx25821/cx25821-sram.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-video-upstream-ch2.c (renamed from drivers/staging/cx25821/cx25821-video-upstream-ch2.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-video-upstream-ch2.h (renamed from drivers/staging/cx25821/cx25821-video-upstream-ch2.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-video-upstream.c (renamed from drivers/staging/cx25821/cx25821-video-upstream.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-video-upstream.h (renamed from drivers/staging/cx25821/cx25821-video-upstream.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-video.c (renamed from drivers/staging/cx25821/cx25821-video.c) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821-video.h (renamed from drivers/staging/cx25821/cx25821-video.h) | 0 | ||||
-rw-r--r-- | drivers/media/video/cx25821/cx25821.h (renamed from drivers/staging/cx25821/cx25821.h) | 0 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/cx25821/README | 6 |
29 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index d285c8c9281..d471d1e5a74 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -736,6 +736,8 @@ source "drivers/media/video/cx88/Kconfig" source "drivers/media/video/cx23885/Kconfig" +source "drivers/media/video/cx25821/Kconfig" + source "drivers/media/video/au0828/Kconfig" source "drivers/media/video/ivtv/Kconfig" diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 11fff97e719..faba1e33311 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -104,6 +104,7 @@ 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/ diff --git a/drivers/staging/cx25821/Kconfig b/drivers/media/video/cx25821/Kconfig index 5f6b5421371..5f6b5421371 100644 --- a/drivers/staging/cx25821/Kconfig +++ b/drivers/media/video/cx25821/Kconfig diff --git a/drivers/staging/cx25821/Makefile b/drivers/media/video/cx25821/Makefile index aedde18c68f..aedde18c68f 100644 --- a/drivers/staging/cx25821/Makefile +++ b/drivers/media/video/cx25821/Makefile diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/media/video/cx25821/cx25821-alsa.c index 09e99de5fd2..09e99de5fd2 100644 --- a/drivers/staging/cx25821/cx25821-alsa.c +++ b/drivers/media/video/cx25821/cx25821-alsa.c diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/media/video/cx25821/cx25821-audio-upstream.c index c20d6dece15..c20d6dece15 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.c +++ b/drivers/media/video/cx25821/cx25821-audio-upstream.c diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.h b/drivers/media/video/cx25821/cx25821-audio-upstream.h index af2ae7c5815..af2ae7c5815 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.h +++ b/drivers/media/video/cx25821/cx25821-audio-upstream.h diff --git a/drivers/staging/cx25821/cx25821-audio.h b/drivers/media/video/cx25821/cx25821-audio.h index 8eb55b7b88c..8eb55b7b88c 100644 --- a/drivers/staging/cx25821/cx25821-audio.h +++ b/drivers/media/video/cx25821/cx25821-audio.h diff --git a/drivers/staging/cx25821/cx25821-biffuncs.h b/drivers/media/video/cx25821/cx25821-biffuncs.h index 9326a7c729e..9326a7c729e 100644 --- a/drivers/staging/cx25821/cx25821-biffuncs.h +++ b/drivers/media/video/cx25821/cx25821-biffuncs.h diff --git a/drivers/staging/cx25821/cx25821-cards.c b/drivers/media/video/cx25821/cx25821-cards.c index 6ace60313b4..6ace60313b4 100644 --- a/drivers/staging/cx25821/cx25821-cards.c +++ b/drivers/media/video/cx25821/cx25821-cards.c diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c index a7fa38f9594..a7fa38f9594 100644 --- a/drivers/staging/cx25821/cx25821-core.c +++ b/drivers/media/video/cx25821/cx25821-core.c diff --git a/drivers/staging/cx25821/cx25821-gpio.c b/drivers/media/video/cx25821/cx25821-gpio.c index 29e43b03c85..29e43b03c85 100644 --- a/drivers/staging/cx25821/cx25821-gpio.c +++ b/drivers/media/video/cx25821/cx25821-gpio.c diff --git a/drivers/staging/cx25821/cx25821-i2c.c b/drivers/media/video/cx25821/cx25821-i2c.c index 4d3d0ce4078..4d3d0ce4078 100644 --- a/drivers/staging/cx25821/cx25821-i2c.c +++ b/drivers/media/video/cx25821/cx25821-i2c.c diff --git a/drivers/staging/cx25821/cx25821-medusa-defines.h b/drivers/media/video/cx25821/cx25821-medusa-defines.h index 60d197f5755..60d197f5755 100644 --- a/drivers/staging/cx25821/cx25821-medusa-defines.h +++ b/drivers/media/video/cx25821/cx25821-medusa-defines.h diff --git a/drivers/staging/cx25821/cx25821-medusa-reg.h b/drivers/media/video/cx25821/cx25821-medusa-reg.h index 1c1c228352d..1c1c228352d 100644 --- a/drivers/staging/cx25821/cx25821-medusa-reg.h +++ b/drivers/media/video/cx25821/cx25821-medusa-reg.h diff --git a/drivers/staging/cx25821/cx25821-medusa-video.c b/drivers/media/video/cx25821/cx25821-medusa-video.c index fc780d0908d..fc780d0908d 100644 --- a/drivers/staging/cx25821/cx25821-medusa-video.c +++ b/drivers/media/video/cx25821/cx25821-medusa-video.c diff --git a/drivers/staging/cx25821/cx25821-medusa-video.h b/drivers/media/video/cx25821/cx25821-medusa-video.h index 6175e096185..6175e096185 100644 --- a/drivers/staging/cx25821/cx25821-medusa-video.h +++ b/drivers/media/video/cx25821/cx25821-medusa-video.h diff --git a/drivers/staging/cx25821/cx25821-reg.h b/drivers/media/video/cx25821/cx25821-reg.h index a3fc25a4dc0..a3fc25a4dc0 100644 --- a/drivers/staging/cx25821/cx25821-reg.h +++ b/drivers/media/video/cx25821/cx25821-reg.h diff --git a/drivers/staging/cx25821/cx25821-sram.h b/drivers/media/video/cx25821/cx25821-sram.h index 5f05d153bc4..5f05d153bc4 100644 --- a/drivers/staging/cx25821/cx25821-sram.h +++ b/drivers/media/video/cx25821/cx25821-sram.h diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c index 2a724ddfa53..2a724ddfa53 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c +++ b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.h b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.h index d42dab59b66..d42dab59b66 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.h +++ b/drivers/media/video/cx25821/cx25821-video-upstream-ch2.h diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/media/video/cx25821/cx25821-video-upstream.c index c0b80068f46..c0b80068f46 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream.c +++ b/drivers/media/video/cx25821/cx25821-video-upstream.c diff --git a/drivers/staging/cx25821/cx25821-video-upstream.h b/drivers/media/video/cx25821/cx25821-video-upstream.h index 268ec8aa6a6..268ec8aa6a6 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream.h +++ b/drivers/media/video/cx25821/cx25821-video-upstream.h diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/media/video/cx25821/cx25821-video.c index 084fc0899e1..084fc0899e1 100644 --- a/drivers/staging/cx25821/cx25821-video.c +++ b/drivers/media/video/cx25821/cx25821-video.c diff --git a/drivers/staging/cx25821/cx25821-video.h b/drivers/media/video/cx25821/cx25821-video.h index d0d9538ca5b..d0d9538ca5b 100644 --- a/drivers/staging/cx25821/cx25821-video.h +++ b/drivers/media/video/cx25821/cx25821-video.h diff --git a/drivers/staging/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h index db2615b2bac..db2615b2bac 100644 --- a/drivers/staging/cx25821/cx25821.h +++ b/drivers/media/video/cx25821/cx25821.h diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 0e1bc6dcccc..39df8597d31 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -32,8 +32,6 @@ source "drivers/staging/slicoss/Kconfig" source "drivers/staging/go7007/Kconfig" -source "drivers/staging/cx25821/Kconfig" - source "drivers/staging/cxd2099/Kconfig" source "drivers/staging/usbip/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 51999860b0f..cd1bcc1f0e6 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -7,7 +7,6 @@ obj-y += serial/ obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ -obj-$(CONFIG_VIDEO_CX25821) += cx25821/ obj-$(CONFIG_DVB_CXD2099) += cxd2099/ obj-$(CONFIG_LIRC_STAGING) += lirc/ obj-$(CONFIG_USBIP_CORE) += usbip/ diff --git a/drivers/staging/cx25821/README b/drivers/staging/cx25821/README deleted file mode 100644 index a9ba50b9888..00000000000 --- a/drivers/staging/cx25821/README +++ /dev/null @@ -1,6 +0,0 @@ -Todo: - - checkpatch.pl cleanups - - sparse cleanups - -Please send patches to linux-media@vger.kernel.org - |