---

yaml --- r: 330786 b: refs/heads/master c: 062ef0d h: refs/heads/master v: v3
git-mirror · Aug 12, 2012 · d79cdc1 · d79cdc1
1 parent 0d1eba6
commit d79cdc1
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 10,003 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cb2173e6ea8f2948bd1367c93083a2500fcf08f
+refs/heads/master: 062ef0d4bb66e975a79dec4d5cc3ef1bf584efef
diff --git a/trunk/drivers/staging/media/Kconfig b/trunk/drivers/staging/media/Kconfig
@@ -25,8 +25,6 @@ source "drivers/staging/media/cxd2099/Kconfig"
 
 source "drivers/staging/media/dt3155v4l/Kconfig"
 
-source "drivers/staging/media/easycap/Kconfig"
-
 source "drivers/staging/media/go7007/Kconfig"
 
 source "drivers/staging/media/solo6x10/Kconfig"

diff --git a/trunk/drivers/staging/media/Makefile b/trunk/drivers/staging/media/Makefile
@@ -1,6 +1,5 @@
 obj-$(CONFIG_DVB_AS102)		+= as102/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
-obj-$(CONFIG_EASYCAP)		+= easycap/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_SOLO6X10)		+= solo6x10/
 obj-$(CONFIG_VIDEO_DT3155)	+= dt3155v4l/

diff --git a/trunk/drivers/staging/media/easycap/Kconfig b/trunk/drivers/staging/media/easycap/Kconfig
diff --git a/trunk/drivers/staging/media/easycap/Makefile b/trunk/drivers/staging/media/easycap/Makefile
diff --git a/trunk/drivers/staging/media/easycap/README b/trunk/drivers/staging/media/easycap/README