---

yaml --- r: 241891 b: refs/heads/master c: 37d803e h: refs/heads/master i: 241889: 69b99a6 241887: accb264 v: v3
git-mirror · Mar 21, 2011 · 7e3ea73 · 7e3ea73
1 parent 29d7ecb
commit 7e3ea73
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 3,921 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76fafe78df9e4062b9b6595f3225a2c0c2847ae5
+refs/heads/master: 37d803ed0b86a3252457da971e0e9a8a937c2ba4
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -57,8 +57,6 @@ source "drivers/staging/dabusb/Kconfig"
 
 source "drivers/staging/se401/Kconfig"
 
-source "drivers/staging/usbvideo/Kconfig"
-
 source "drivers/staging/usbip/Kconfig"
 
 source "drivers/staging/winbond/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_VIDEO_CX25821)	+= cx25821/
 obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_USB_DABUSB)        += dabusb/
-obj-$(CONFIG_USB_VICAM)         += usbvideo/
 obj-$(CONFIG_USB_SE401)         += se401/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

diff --git a/trunk/drivers/staging/usbvideo/Kconfig b/trunk/drivers/staging/usbvideo/Kconfig
diff --git a/trunk/drivers/staging/usbvideo/Makefile b/trunk/drivers/staging/usbvideo/Makefile
diff --git a/trunk/drivers/staging/usbvideo/TODO b/trunk/drivers/staging/usbvideo/TODO