Merge tag 'pci-v4.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-block.git] / Documentation / ioctl / ioctl-number.txt

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 0682bd3eaa8a974b33dd565db978a251e13121af..eccb675a285259391f7bfb4213acc218e77b6c5f 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -213,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!