From: Mauro Carvalho Chehab Date: Wed, 2 Nov 2011 01:31:14 +0000 (-0200) Subject: [media] move cx25821 out of staging X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d6ce55de3abcc;p=mv-sheeva.git [media] move cx25821 out of staging This driver had the major issues already fixed. Move it out of staging. Acked-by: Greg Kroah-Hartman Signed-off-by: Mauro Carvalho Chehab --- 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 similarity index 100% rename from drivers/staging/cx25821/Kconfig rename to drivers/media/video/cx25821/Kconfig diff --git a/drivers/staging/cx25821/Makefile b/drivers/media/video/cx25821/Makefile similarity index 100% rename from drivers/staging/cx25821/Makefile rename to drivers/media/video/cx25821/Makefile diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/media/video/cx25821/cx25821-alsa.c similarity index 100% rename from drivers/staging/cx25821/cx25821-alsa.c rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-audio-upstream.c rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-audio-upstream.h rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-audio.h rename to drivers/media/video/cx25821/cx25821-audio.h diff --git a/drivers/staging/cx25821/cx25821-biffuncs.h b/drivers/media/video/cx25821/cx25821-biffuncs.h similarity index 100% rename from drivers/staging/cx25821/cx25821-biffuncs.h rename to drivers/media/video/cx25821/cx25821-biffuncs.h diff --git a/drivers/staging/cx25821/cx25821-cards.c b/drivers/media/video/cx25821/cx25821-cards.c similarity index 100% rename from drivers/staging/cx25821/cx25821-cards.c rename to drivers/media/video/cx25821/cx25821-cards.c diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c similarity index 100% rename from drivers/staging/cx25821/cx25821-core.c rename to drivers/media/video/cx25821/cx25821-core.c diff --git a/drivers/staging/cx25821/cx25821-gpio.c b/drivers/media/video/cx25821/cx25821-gpio.c similarity index 100% rename from drivers/staging/cx25821/cx25821-gpio.c rename to drivers/media/video/cx25821/cx25821-gpio.c diff --git a/drivers/staging/cx25821/cx25821-i2c.c b/drivers/media/video/cx25821/cx25821-i2c.c similarity index 100% rename from drivers/staging/cx25821/cx25821-i2c.c rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-medusa-defines.h rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-medusa-reg.h rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-medusa-video.c rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-medusa-video.h rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-reg.h rename to drivers/media/video/cx25821/cx25821-reg.h diff --git a/drivers/staging/cx25821/cx25821-sram.h b/drivers/media/video/cx25821/cx25821-sram.h similarity index 100% rename from drivers/staging/cx25821/cx25821-sram.h rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-video-upstream-ch2.c rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-video-upstream-ch2.h rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-video-upstream.c rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-video-upstream.h rename to 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 similarity index 100% rename from drivers/staging/cx25821/cx25821-video.c rename to drivers/media/video/cx25821/cx25821-video.c diff --git a/drivers/staging/cx25821/cx25821-video.h b/drivers/media/video/cx25821/cx25821-video.h similarity index 100% rename from drivers/staging/cx25821/cx25821-video.h rename to drivers/media/video/cx25821/cx25821-video.h diff --git a/drivers/staging/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h similarity index 100% rename from drivers/staging/cx25821/cx25821.h rename to 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 -