include/asm-x86/setup.h: checkpatch cleanups - formatting only

[sfrench/cifs-2.6.git] / Documentation / ioctl-number.txt

diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 8f750c0efed5ed0adc5329ff5bd6a5e17d5c9113..c18363bd8d11b1f8b3c725c7c12639568033a115 100644 (file)
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -67,7 +67,7 @@ Code  Seq#    Include File            Comments
 0x00   00-1F   linux/wavefront.h       conflict!
 0x02   all     linux/fd.h
 0x03   all     linux/hdreg.h
-0x04   all     linux/umsdos_fs.h
+0x04   D2-DC   linux/umsdos_fs.h       Dead since 2.6.11, but don't reuse these.
 0x06   all     linux/lp.h
 0x09   all     linux/md.h
 0x12   all     linux/fs.h
@@ -138,7 +138,9 @@ Code        Seq#    Include File            Comments
 'm'    00-1F   net/irda/irmod.h        conflict!
 'n'    00-7F   linux/ncp_fs.h
 'n'    E0-FF   video/matrox.h          matroxfb
-'p'    00-3F   linux/mc146818rtc.h
+'o'    00-1F   fs/ocfs2/ocfs2_fs.h     OCFS2
+'p'    00-0F   linux/phantom.h         conflict! (OpenHaptics needs this)
+'p'    00-3F   linux/mc146818rtc.h     conflict!
 'p'    40-7F   linux/nvram.h
 'p'    80-9F                           user-space parport
                                        <mailto:tim@cyberelk.net>