mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 1/1] Doc: isicom, remove reserved ioctl-number
@ 2006-12-29 20:55 Jiri Slaby
  0 siblings, 0 replies; only message in thread
From: Jiri Slaby @ 2006-12-29 20:55 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel, Michael Elizabeth Chastain

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>

---
commit 5bdb7cc0e955ee7724ff519a212aceb706e4814d
tree 27615584648d8776da636a527a16fed31ca51bca
parent 549237a65498ad3880cd1ca40f23f8bc942041cb
author Jiri Slaby <jirislaby@gmail.com> Fri, 29 Dec 2006 21:48:23 +0059
committer Jiri Slaby <jirislaby@gmail.com> 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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2006-12-29 20:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-12-29 20:55 [PATCH 1/1] Doc: isicom, remove reserved ioctl-number Jiri Slaby

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®