git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92e9d1b
)
[media] move cx25821 out of staging
author
Mauro Carvalho Chehab
<mchehab@redhat.com>
Wed, 2 Nov 2011 01:31:14 +0000
(23:31 -0200)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Thu, 3 Nov 2011 09:58:21 +0000
(07:58 -0200)
This driver had the major issues already fixed. Move it out
of staging.
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
29 files changed:
drivers/media/video/Kconfig
patch
|
blob
|
history
drivers/media/video/Makefile
patch
|
blob
|
history
drivers/media/video/cx25821/Kconfig
[moved from
drivers/staging/cx25821/Kconfig
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/Makefile
[moved from
drivers/staging/cx25821/Makefile
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-alsa.c
[moved from
drivers/staging/cx25821/cx25821-alsa.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-audio-upstream.c
[moved from
drivers/staging/cx25821/cx25821-audio-upstream.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-audio-upstream.h
[moved from
drivers/staging/cx25821/cx25821-audio-upstream.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-audio.h
[moved from
drivers/staging/cx25821/cx25821-audio.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-biffuncs.h
[moved from
drivers/staging/cx25821/cx25821-biffuncs.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-cards.c
[moved from
drivers/staging/cx25821/cx25821-cards.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-core.c
[moved from
drivers/staging/cx25821/cx25821-core.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-gpio.c
[moved from
drivers/staging/cx25821/cx25821-gpio.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-i2c.c
[moved from
drivers/staging/cx25821/cx25821-i2c.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-medusa-defines.h
[moved from
drivers/staging/cx25821/cx25821-medusa-defines.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-medusa-reg.h
[moved from
drivers/staging/cx25821/cx25821-medusa-reg.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-medusa-video.c
[moved from
drivers/staging/cx25821/cx25821-medusa-video.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-medusa-video.h
[moved from
drivers/staging/cx25821/cx25821-medusa-video.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-reg.h
[moved from
drivers/staging/cx25821/cx25821-reg.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-sram.h
[moved from
drivers/staging/cx25821/cx25821-sram.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-video-upstream-ch2.c
[moved from
drivers/staging/cx25821/cx25821-video-upstream-ch2.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-video-upstream-ch2.h
[moved from
drivers/staging/cx25821/cx25821-video-upstream-ch2.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-video-upstream.c
[moved from
drivers/staging/cx25821/cx25821-video-upstream.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-video-upstream.h
[moved from
drivers/staging/cx25821/cx25821-video-upstream.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-video.c
[moved from
drivers/staging/cx25821/cx25821-video.c
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821-video.h
[moved from
drivers/staging/cx25821/cx25821-video.h
with 100% similarity]
patch
|
blob
|
history
drivers/media/video/cx25821/cx25821.h
[moved from
drivers/staging/cx25821/cx25821.h
with 100% similarity]
patch
|
blob
|
history
drivers/staging/Kconfig
patch
|
blob
|
history
drivers/staging/Makefile
patch
|
blob
|
history
drivers/staging/cx25821/README
[deleted file]
patch
|
blob
|
history
diff --git
a/drivers/media/video/Kconfig
b/drivers/media/video/Kconfig
index d285c8c92819472d0ec0bc3a13afe9821f0680fd..d471d1e5a74487159f1d8238c22a7cf7ba1d97b1 100644
(file)
--- 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/cx23885/Kconfig"
+source "drivers/media/video/cx25821/Kconfig"
+
source "drivers/media/video/au0828/Kconfig"
source "drivers/media/video/ivtv/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 11fff97e7196c43cb2b2aa5cab7200d9042882ee..faba1e333110ec416f3b644ddf582195afe85072 100644
(file)
--- 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_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_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 0e1bc6dccccb08514e16610f4fec21d30423bc39..39df8597d310632c77cb95f1bff719b5e2fa6f03 100644
(file)
--- 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/go7007/Kconfig"
-source "drivers/staging/cx25821/Kconfig"
-
source "drivers/staging/cxd2099/Kconfig"
source "drivers/staging/usbip/Kconfig"
source "drivers/staging/cxd2099/Kconfig"
source "drivers/staging/usbip/Kconfig"
diff --git
a/drivers/staging/Makefile
b/drivers/staging/Makefile
index 51999860b0f6a59aedcb7b53eb76df175dc4c261..cd1bcc1f0e661251a9e88df5f9f51a9cb41a3d16 100644
(file)
--- 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_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/
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
(file)
index
a9ba50b
..0000000
--- 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
-