summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-08-23 20:57:47 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-08-23 20:57:47 +0200
commitd5d46ca491d8974ac1eaf7bad3d69e468e49dc34 (patch)
tree07d3edcfd48e46e49983aa9dc9db633465ff303b
parent62441b5b1c30d8814dbe54287fd2a6efcd12549a (diff)
downloadkernel-crypto-d5d46ca491d8974ac1eaf7bad3d69e468e49dc34.tar.gz
kernel-crypto-d5d46ca491d8974ac1eaf7bad3d69e468e49dc34.tar.xz
kernel-crypto-d5d46ca491d8974ac1eaf7bad3d69e468e49dc34.zip
Reserve ioctl range for <linux/ncr.h>
-rw-r--r--Documentation/ioctl/ioctl-number.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 35cf64d4436..bdca2d758f9 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -201,6 +201,7 @@ Code Seq#(hex) Include File Comments
'c' 00-1F linux/chio.h conflict!
'c' 80-9F arch/s390/include/asm/chsc.h conflict!
'c' A0-AF arch/x86/include/asm/msr.h conflict!
+'c' C0-DF linux/ncr.h conflict!
'd' 00-FF linux/char/drm/drm/h conflict!
'd' 02-40 pcmcia/ds.h conflict!
'd' 10-3F drivers/media/video/dabusb.h conflict!