---

yaml --- r: 271882 b: refs/heads/master c: be30497 h: refs/heads/master v: v3
git-mirror · Sep 23, 2011 · 95d5063 · 95d5063
1 parent 2bd4383
commit 95d5063
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 34 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45dbf0db5ac974fb699fec39330d01642dff98dc
+refs/heads/master: be304970850806abea880da95fbfb743a4d9f87d
diff --git a/trunk/drivers/staging/tm6000/CARDLIST → ...Documentation/video4linux/CARDLIST.tm6000 b/trunk/drivers/staging/tm6000/CARDLIST → ...Documentation/video4linux/CARDLIST.tm6000
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
@@ -1019,6 +1019,8 @@ source "drivers/media/video/tlg2300/Kconfig"
 
 source "drivers/media/video/cx231xx/Kconfig"
 
+source "drivers/media/video/tm6000/Kconfig"
+
 source "drivers/media/video/usbvision/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"

diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -107,6 +107,7 @@ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
 obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
+obj-$(CONFIG_VIDEO_TM6000) += tm6000/
 obj-$(CONFIG_VIDEO_MXB) += mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
 obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o

diff --git a/trunk/drivers/staging/tm6000/Kconfig → trunk/drivers/media/video/tm6000/Kconfig b/trunk/drivers/staging/tm6000/Kconfig → trunk/drivers/media/video/tm6000/Kconfig
diff --git a/trunk/drivers/staging/tm6000/Makefile → trunk/drivers/media/video/tm6000/Makefile b/trunk/drivers/staging/tm6000/Makefile → trunk/drivers/media/video/tm6000/Makefile
diff --git a/trunk/drivers/staging/tm6000/tm6000-alsa.c → .../drivers/media/video/tm6000/tm6000-alsa.c b/trunk/drivers/staging/tm6000/tm6000-alsa.c → .../drivers/media/video/tm6000/tm6000-alsa.c
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c → ...drivers/media/video/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c → ...drivers/media/video/tm6000/tm6000-cards.c
diff --git a/trunk/drivers/staging/tm6000/tm6000-core.c → .../drivers/media/video/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c → .../drivers/media/video/tm6000/tm6000-core.c
diff --git a/trunk/drivers/staging/tm6000/tm6000-dvb.c → ...k/drivers/media/video/tm6000/tm6000-dvb.c b/trunk/drivers/staging/tm6000/tm6000-dvb.c → ...k/drivers/media/video/tm6000/tm6000-dvb.c
diff --git a/trunk/drivers/staging/tm6000/tm6000-i2c.c → ...k/drivers/media/video/tm6000/tm6000-i2c.c b/trunk/drivers/staging/tm6000/tm6000-i2c.c → ...k/drivers/media/video/tm6000/tm6000-i2c.c
diff --git a/trunk/drivers/staging/tm6000/tm6000-input.c → ...drivers/media/video/tm6000/tm6000-input.c b/trunk/drivers/staging/tm6000/tm6000-input.c → ...drivers/media/video/tm6000/tm6000-input.c
diff --git a/trunk/drivers/staging/tm6000/tm6000-regs.h → .../drivers/media/video/tm6000/tm6000-regs.h b/trunk/drivers/staging/tm6000/tm6000-regs.h → .../drivers/media/video/tm6000/tm6000-regs.h
diff --git a/trunk/drivers/staging/tm6000/tm6000-stds.c → .../drivers/media/video/tm6000/tm6000-stds.c b/trunk/drivers/staging/tm6000/tm6000-stds.c → .../drivers/media/video/tm6000/tm6000-stds.c
diff --git a/.../drivers/staging/tm6000/tm6000-usb-isoc.h → ...vers/media/video/tm6000/tm6000-usb-isoc.h b/.../drivers/staging/tm6000/tm6000-usb-isoc.h → ...vers/media/video/tm6000/tm6000-usb-isoc.h
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c → ...drivers/media/video/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c → ...drivers/media/video/tm6000/tm6000-video.c
diff --git a/trunk/drivers/staging/tm6000/tm6000.h → trunk/drivers/media/video/tm6000/tm6000.h b/trunk/drivers/staging/tm6000/tm6000.h → trunk/drivers/media/video/tm6000/tm6000.h
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -32,8 +32,6 @@ source "drivers/staging/go7007/Kconfig"
 
 source "drivers/staging/cx25821/Kconfig"
 
-source "drivers/staging/tm6000/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-$(CONFIG_ET131X)		+= et131x/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
 obj-$(CONFIG_VIDEO_CX25821)	+= cx25821/
-obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_USBIP_CORE)	+= usbip/

diff --git a/trunk/drivers/staging/tm6000/README b/trunk/drivers/staging/tm6000/README
diff --git a/trunk/drivers/staging/tm6000/TODO b/trunk/drivers/staging/tm6000/TODO