---

yaml --- r: 226340 b: refs/heads/master c: 39c3d48 h: refs/heads/master v: v3
git-mirror · Dec 29, 2010 · ea266c3 · ea266c3
1 parent b1bd329
commit ea266c3
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 8,467 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71bb2876a3b2af8e6fd5ac20921ee0de9e07d809
+refs/heads/master: 39c3d488452ae206cfc8afda0db041ee55d01c3c
diff --git a/trunk/Documentation/video4linux/README.cpia b/trunk/Documentation/video4linux/README.cpia
diff --git a/trunk/Documentation/video4linux/bttv/Cards b/trunk/Documentation/video4linux/bttv/Cards
@@ -464,10 +464,6 @@ Siemens
 -------
    Multimedia eXtension Board (MXB) (SAA7146, SAA7111)
 
-Stradis
--------
-   SDM275,SDM250,SDM026,SDM025 (SAA7146, IBMMPEG2): MPEG2 decoder only
-
 Powercolor
 ----------
    MTV878

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -5697,12 +5697,6 @@ M:	Ion Badulescu <ionut@badula.org>
 S:	Odd Fixes
 F:	drivers/net/starfire*
 
-STRADIS MPEG-2 DECODER DRIVER
-M:	Nathan Laredo <laredo@gnu.org>
-W:	http://www.stradis.com/
-S:	Maintained
-F:	drivers/media/video/stradis.c
-
 SUN3/3X
 M:	Sam Creasey <sammy@sammy.net>
 W:	http://sammy.net/sun3/

diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -51,10 +51,6 @@ source "drivers/staging/cx25821/Kconfig"
 
 source "drivers/staging/tm6000/Kconfig"
 
-source "drivers/staging/cpia/Kconfig"
-
-source "drivers/staging/stradis/Kconfig"
-
 source "drivers/staging/se401/Kconfig"
 
 source "drivers/staging/usbvideo/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -8,8 +8,6 @@ obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
 obj-$(CONFIG_VIDEO_CX25821)	+= cx25821/
 obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/
-obj-$(CONFIG_VIDEO_CPIA)	+= cpia/
-obj-$(CONFIG_VIDEO_STRADIS)	+= stradis/
 obj-$(CONFIG_USB_VICAM)         += usbvideo/
 obj-$(CONFIG_USB_SE401)         += se401/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/

diff --git a/trunk/drivers/staging/cpia/Kconfig b/trunk/drivers/staging/cpia/Kconfig
diff --git a/trunk/drivers/staging/cpia/Makefile b/trunk/drivers/staging/cpia/Makefile
diff --git a/trunk/drivers/staging/cpia/TODO b/trunk/drivers/staging/cpia/TODO
-Original file line number
+Diff line change
@@ Expand Up / @@ -464,10 +464,6 @@ Siemens @@
     -------
        Multimedia eXtension Board (MXB) (SAA7146, SAA7111)
-    Stradis
-    -------
-       SDM275,SDM250,SDM026,SDM025 (SAA7146, IBMMPEG2): MPEG2 decoder only
     Powercolor
     ----------
        MTV878
@@ Expand Down @@