Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 765d94c1 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[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: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c493edd1

Documentation/ioctl-number.txt

+1 −2
Original line number Diff line number Diff line
@@ -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