---

yaml --- r: 137992 b: refs/heads/master c: cc1139c h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 03e35ad · 03e35ad
1 parent f5c4911
commit 03e35ad
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 770060385a1694a8d909e7872c4ce0703da2b069
+refs/heads/master: cc1139c7cdc1455fdf460c33fe63a36524753834
diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -125,7 +125,6 @@ Code	Seq#	Include File		Comments
 'd'	00-DF	linux/video_decoder.h	conflict!
 'd'	F0-FF	linux/digi1.h
 'e'	all	linux/digi1.h		conflict!
-'e'	00-1F	linux/video_encoder.h	conflict!
 'e'	00-1F	net/irda/irtty.h	conflict!
 'f'	00-1F	linux/ext2_fs.h
 'h'	00-7F				Charon filesystem

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

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