Merge branch 'for-3.12/logitech' into for-next

[karo-tx-linux.git] / Documentation / ioctl / ioctl-number.txt

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 237acab169dd723b5a3f9ec3e40c79d55246f48a..2a5f0e14efa351a73ef1eb53c392ecef7c9b4f6b 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -72,6 +72,7 @@ Code  Seq#(hex)       Include File            Comments
 0x06   all     linux/lp.h
 0x09   all     linux/raid/md_u.h
 0x10   00-0F   drivers/char/s390/vmcp.h
+0x10   10-1F   arch/s390/include/uapi/sclp_ctl.h
 0x12   all     linux/fs.h
                linux/blkpg.h
 0x1b   all     InfiniBand Subsystem    <http://infiniband.sourceforge.net/>