From: Jiri Slaby <jirislaby@gmail.com>

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@osdl.org>
---

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

diff -puN Documentation/ioctl-number.txt~doc-isicom-remove-reserved-ioctl-number Documentation/ioctl-number.txt
--- a/Documentation/ioctl-number.txt~doc-isicom-remove-reserved-ioctl-number
+++ a/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
_