Merge branch 'tee/initial-merge' into fixes

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

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 002331b0b48a62a7e44c7e728d66e0f56b03e911..1e9fcb4d0ec83ed4eaf2330f16775769ac366aa3 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -191,6 +191,7 @@ Code  Seq#(hex)     Include File            Comments
 'W'    00-1F   linux/watchdog.h        conflict!
 'W'    00-1F   linux/wanrouter.h       conflict!               (pre 3.9)
 'W'    00-3F   sound/asound.h          conflict!
+'W'    40-5F   drivers/pci/switch/switchtec.c
 'X'    all     fs/xfs/xfs_fs.h         conflict!
                and fs/xfs/linux-2.6/xfs_ioctl32.h
                and include/linux/falloc.h
@@ -212,7 +213,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!
-'d'    00-FF   linux/char/drm/drm/h    conflict!
+'d'    00-FF   linux/char/drm/drm.h    conflict!
 'd'    02-40   pcmcia/ds.h             conflict!
 'd'    F0-FF   linux/digi1.h
 'e'    all     linux/digi1.h           conflict!