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 <[EMAIL PROTECTED]>

---
commit 5bdb7cc0e955ee7724ff519a212aceb706e4814d
tree 27615584648d8776da636a527a16fed31ca51bca
parent 549237a65498ad3880cd1ca40f23f8bc942041cb
author Jiri Slaby <[EMAIL PROTECTED]> Fri, 29 Dec 2006 21:48:23 +0059
committer Jiri Slaby <[EMAIL PROTECTED]> Fri, 29 Dec 2006 21:48:23 +0059

 Documentation/ioctl-number.txt |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 5a8bd5b..8f750c0 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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to