---

yaml --- r: 273613 b: refs/heads/master c: d6ce55d h: refs/heads/master i: 273611: 6baa296 v: v3
git-mirror · Nov 3, 2011 · d6be9b4 · d6be9b4
1 parent ae8ee24
commit d6be9b4
Show file tree

Hide file tree

Showing 30 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92e9d1b70f7dd41576b9a890bc34a14f4cc2185b
+refs/heads/master: d6ce55de3abcc4910fef1d79212a17480c154704
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/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/trunk/drivers/media/video/Makefile b/trunk/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/trunk/drivers/staging/cx25821/Kconfig → trunk/drivers/media/video/cx25821/Kconfig b/trunk/drivers/staging/cx25821/Kconfig → trunk/drivers/media/video/cx25821/Kconfig
diff --git a/trunk/drivers/staging/cx25821/Makefile → trunk/drivers/media/video/cx25821/Makefile b/trunk/drivers/staging/cx25821/Makefile → trunk/drivers/media/video/cx25821/Makefile
diff --git a/trunk/drivers/staging/cx25821/cx25821-alsa.c → ...rivers/media/video/cx25821/cx25821-alsa.c b/trunk/drivers/staging/cx25821/cx25821-alsa.c → ...rivers/media/video/cx25821/cx25821-alsa.c
diff --git a/.../staging/cx25821/cx25821-audio-upstream.c → ...ia/video/cx25821/cx25821-audio-upstream.c b/.../staging/cx25821/cx25821-audio-upstream.c → ...ia/video/cx25821/cx25821-audio-upstream.c
diff --git a/.../staging/cx25821/cx25821-audio-upstream.h → ...ia/video/cx25821/cx25821-audio-upstream.h b/.../staging/cx25821/cx25821-audio-upstream.h → ...ia/video/cx25821/cx25821-audio-upstream.h
diff --git a/...k/drivers/staging/cx25821/cx25821-audio.h → ...ivers/media/video/cx25821/cx25821-audio.h b/...k/drivers/staging/cx25821/cx25821-audio.h → ...ivers/media/video/cx25821/cx25821-audio.h
diff --git a/...rivers/staging/cx25821/cx25821-biffuncs.h → ...rs/media/video/cx25821/cx25821-biffuncs.h b/...rivers/staging/cx25821/cx25821-biffuncs.h → ...rs/media/video/cx25821/cx25821-biffuncs.h
diff --git a/...k/drivers/staging/cx25821/cx25821-cards.c → ...ivers/media/video/cx25821/cx25821-cards.c b/...k/drivers/staging/cx25821/cx25821-cards.c → ...ivers/media/video/cx25821/cx25821-cards.c
diff --git a/trunk/drivers/staging/cx25821/cx25821-core.c → ...rivers/media/video/cx25821/cx25821-core.c b/trunk/drivers/staging/cx25821/cx25821-core.c → ...rivers/media/video/cx25821/cx25821-core.c
diff --git a/trunk/drivers/staging/cx25821/cx25821-gpio.c → ...rivers/media/video/cx25821/cx25821-gpio.c b/trunk/drivers/staging/cx25821/cx25821-gpio.c → ...rivers/media/video/cx25821/cx25821-gpio.c
diff --git a/trunk/drivers/staging/cx25821/cx25821-i2c.c → ...drivers/media/video/cx25821/cx25821-i2c.c b/trunk/drivers/staging/cx25821/cx25821-i2c.c → ...drivers/media/video/cx25821/cx25821-i2c.c
diff --git a/.../staging/cx25821/cx25821-medusa-defines.h → ...ia/video/cx25821/cx25821-medusa-defines.h b/.../staging/cx25821/cx25821-medusa-defines.h → ...ia/video/cx25821/cx25821-medusa-defines.h
diff --git a/...vers/staging/cx25821/cx25821-medusa-reg.h → .../media/video/cx25821/cx25821-medusa-reg.h b/...vers/staging/cx25821/cx25821-medusa-reg.h → .../media/video/cx25821/cx25821-medusa-reg.h
diff --git a/...rs/staging/cx25821/cx25821-medusa-video.c → ...edia/video/cx25821/cx25821-medusa-video.c b/...rs/staging/cx25821/cx25821-medusa-video.c → ...edia/video/cx25821/cx25821-medusa-video.c
diff --git a/...rs/staging/cx25821/cx25821-medusa-video.h → ...edia/video/cx25821/cx25821-medusa-video.h b/...rs/staging/cx25821/cx25821-medusa-video.h → ...edia/video/cx25821/cx25821-medusa-video.h
diff --git a/trunk/drivers/staging/cx25821/cx25821-reg.h → ...drivers/media/video/cx25821/cx25821-reg.h b/trunk/drivers/staging/cx25821/cx25821-reg.h → ...drivers/media/video/cx25821/cx25821-reg.h
diff --git a/trunk/drivers/staging/cx25821/cx25821-sram.h → ...rivers/media/video/cx25821/cx25821-sram.h b/trunk/drivers/staging/cx25821/cx25821-sram.h → ...rivers/media/video/cx25821/cx25821-sram.h
diff --git a/...ging/cx25821/cx25821-video-upstream-ch2.c → ...ideo/cx25821/cx25821-video-upstream-ch2.c b/...ging/cx25821/cx25821-video-upstream-ch2.c → ...ideo/cx25821/cx25821-video-upstream-ch2.c
diff --git a/...ging/cx25821/cx25821-video-upstream-ch2.h → ...ideo/cx25821/cx25821-video-upstream-ch2.h b/...ging/cx25821/cx25821-video-upstream-ch2.h → ...ideo/cx25821/cx25821-video-upstream-ch2.h
diff --git a/.../staging/cx25821/cx25821-video-upstream.c → ...ia/video/cx25821/cx25821-video-upstream.c b/.../staging/cx25821/cx25821-video-upstream.c → ...ia/video/cx25821/cx25821-video-upstream.c
diff --git a/.../staging/cx25821/cx25821-video-upstream.h → ...ia/video/cx25821/cx25821-video-upstream.h b/.../staging/cx25821/cx25821-video-upstream.h → ...ia/video/cx25821/cx25821-video-upstream.h
diff --git a/...k/drivers/staging/cx25821/cx25821-video.c → ...ivers/media/video/cx25821/cx25821-video.c b/...k/drivers/staging/cx25821/cx25821-video.c → ...ivers/media/video/cx25821/cx25821-video.c
diff --git a/...k/drivers/staging/cx25821/cx25821-video.h → ...ivers/media/video/cx25821/cx25821-video.h b/...k/drivers/staging/cx25821/cx25821-video.h → ...ivers/media/video/cx25821/cx25821-video.h
diff --git a/trunk/drivers/staging/cx25821/cx25821.h → trunk/drivers/media/video/cx25821/cx25821.h b/trunk/drivers/staging/cx25821/cx25821.h → trunk/drivers/media/video/cx25821/cx25821.h
diff --git a/trunk/drivers/staging/Kconfig b/trunk/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/trunk/drivers/staging/Makefile b/trunk/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/trunk/drivers/staging/cx25821/README b/trunk/drivers/staging/cx25821/README