summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-02-10 01:45:17 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:29 -0800
commit765d94c1b37d08be02eea6abbff70c0fda0ba984 (patch)
treec6c784b5020efd71b20b4c713230933cdab5993f /Documentation
parentc493edd13d633ba556cd71eeae9d062b6912c55d (diff)
downloadlinux-765d94c1b37d08be02eea6abbff70c0fda0ba984.tar.gz
linux-765d94c1b37d08be02eea6abbff70c0fda0ba984.tar.bz2
linux-765d94c1b37d08be02eea6abbff70c0fda0ba984.zip
[PATCH] Doc: isicom, remove reserved ioctl-number
Isicom driver no longer registers chardev with ioctl function. It used to use for firmware loading. Remove the reserved letter (M) from ioctl-number, so that the conflict get away. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ioctl-number.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 5a8bd5bd88ef..8f750c0efed5 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -94,8 +94,7 @@ Code Seq# Include File Comments
'L' 00-1F linux/loop.h
'L' E0-FF linux/ppdd.h encrypted disk device driver
<http://linux01.gwdg.de/~alatham/ppdd.html>
-'M' all linux/soundcard.h conflict!
-'M' 00-1F linux/isicom.h conflict!
+'M' all linux/soundcard.h
'N' 00-1F drivers/usb/scanner.h
'P' all linux/soundcard.h
'Q' all linux/soundcard.h