X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=Documentation%2Fioctl%2Fioctl-number.txt;h=81c7f2bb7daf09c9c414bf5f90afc7c259b24e38;hb=b2edcdae3d9a29b25f6c161a8711caa74ce49991;hp=56af5e43e9c0280bece5b78e8f3b0577cf570aaf;hpb=b325e04ea21081439f0f3e7fe1117e883a9031d8;p=cascardo%2Flinux.git diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 56af5e43e9c0..81c7f2bb7daf 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -248,7 +248,7 @@ Code Seq#(hex) Include File Comments 'm' 00 drivers/scsi/megaraid/megaraid_ioctl.h conflict! 'm' 00-1F net/irda/irmod.h conflict! 'n' 00-7F linux/ncp_fs.h and fs/ncpfs/ioctl.c -'n' 80-8F linux/nilfs2_fs.h NILFS2 +'n' 80-8F uapi/linux/nilfs2_api.h NILFS2 'n' E0-FF linux/matroxfb.h matroxfb 'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 'o' 00-03 mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps)