---

yaml --- r: 138118 b: refs/heads/master c: 42d12f5 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · df5f183 · df5f183
1 parent 4a75cc5
commit df5f183
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 56 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f5b5cf600ba860ba684e349e63d46438ba05cdf
+refs/heads/master: 42d12f5aa105af08bc0ed0580e32156a1a325c6b
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
@@ -64,10 +64,10 @@ Who:	Pavel Machek <pavel@suse.cz>
 
 ---------------------------
 
-What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.
-When:	December 2008
-Files:	include/linux/video_decoder.h include/linux/videodev.h
-Check:	include/linux/video_decoder.h include/linux/videodev.h
+What:	Video4Linux API 1 ioctls and from Video devices.
+When:	July 2009
+Files:	include/linux/videodev.h
+Check:	include/linux/videodev.h
 Why:	V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6
 	series. The old API have lots of drawbacks and don't provide enough
 	means to work with all video and audio standards. The newer API is

diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -122,7 +122,6 @@ Code	Seq#	Include File		Comments
 'c'	00-7F	linux/coda.h		conflict!
 'c'	80-9F	arch/s390/include/asm/chsc.h
 'd'	00-FF	linux/char/drm/drm/h	conflict!
-'d'	00-DF	linux/video_decoder.h	conflict!
 'd'	F0-FF	linux/digi1.h
 'e'	all	linux/digi1.h		conflict!
 'e'	00-1F	net/irda/irtty.h	conflict!

diff --git a/trunk/drivers/media/video/mxb.c b/trunk/drivers/media/video/mxb.c
@@ -25,7 +25,6 @@
 
 #include <media/saa7146_vv.h>
 #include <media/tuner.h>
-#include <linux/video_decoder.h>
 #include <media/v4l2-common.h>
 #include <media/saa7115.h>
 

diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
@@ -158,7 +158,6 @@ header-y += ultrasound.h
 header-y += un.h
 header-y += utime.h
 header-y += veth.h
-header-y += video_decoder.h
 header-y += videotext.h
 header-y += x25.h
 

diff --git a/trunk/include/linux/video_decoder.h b/trunk/include/linux/video_decoder.h