Merge tag 'compiler-attributes-for-linus-4.20-rc1' of https://github.com/ojeda/linux

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

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 13a7c999c04ab761f81b0e84663b8f38e7bec622..af6f6ba1fe8045db04440510b3b4984b711bcfe0 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -201,7 +201,7 @@ Code  Seq#(hex)     Include File            Comments
 'X'    01      linux/pktcdvd.h         conflict!
 'Y'    all     linux/cyclades.h
 'Z'    14-15   drivers/message/fusion/mptctl.h
-'['    00-07   linux/usb/tmc.h         USB Test and Measurement Devices
+'['    00-3F   linux/usb/tmc.h         USB Test and Measurement Devices
                                        <mailto:gregkh@linuxfoundation.org>
 'a'    all     linux/atm*.h, linux/sonet.h     ATM on linux
                                        <http://lrcwww.epfl.ch/>
@@ -272,6 +272,7 @@ Code  Seq#(hex)     Include File            Comments
 't'    90-91   linux/toshiba.h         toshiba and toshiba_acpi SMM
 'u'    00-1F   linux/smb_fs.h          gone
 'u'    20-3F   linux/uvcvideo.h        USB video class host driver
+'u'    40-4f   linux/udmabuf.h         userspace dma-buf misc device
 'v'    00-1F   linux/ext2_fs.h         conflict!
 'v'    00-1F   linux/fs.h              conflict!
 'v'    00-0F   linux/sonypi.h          conflict!