X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Documentation%2Fioctl-number.txt;h=5a8bd5bd88eff17f02421165fff6811674e0a53f;hb=2fd592e45b9c89d69e126f172d0f991e2af955e5;hp=1543802ef53ec8f5ee434fe6c6a63b443e741103;hpb=6edad161cd4dfe1df772e7a74ab63cab53b5e8c1;p=linux-2.6

diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 1543802ef5..5a8bd5bd88 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -119,7 +119,6 @@ Code	Seq#	Include File		Comments
 'c'	00-7F	linux/comstats.h	conflict!
 'c'	00-7F	linux/coda.h		conflict!
 'd'	00-FF	linux/char/drm/drm/h	conflict!
-'d'	00-1F	linux/devfs_fs.h	conflict!
 'd'	00-DF	linux/video_decoder.h	conflict!
 'd'	F0-FF	linux/digi1.h
 'e'	all	linux/digi1.h		conflict!
@@ -192,3 +191,5 @@ Code	Seq#	Include File		Comments
 					<mailto:aherrman@de.ibm.com>
 0xF3	00-3F	video/sisfb.h		sisfb (in development)
 					<mailto:thomas@winischhofer.net>
+0xF4	00-1F	video/mbxfb.h		mbxfb
+					<mailto:raph@8d.com>