From c5b8431703c6bd0a536b6fd832e94768871694b9 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sat, 10 Feb 2007 01:45:17 -0800 Subject: [PATCH] --- yaml --- r: 47535 b: refs/heads/master c: 765d94c1b37d08be02eea6abbff70c0fda0ba984 h: refs/heads/master i: 47533: 1703dd262107b8ac44d4154469229cb1b42057fd 47531: 95b5e56f42dc2ce010a2a4f4720d84d21051c578 47527: a0d370eb97e246abecc27b6a402297eaa467399a 47519: 14dbc6792e78a857684a057158047d6c5c74cb2a v: v3 --- [refs] | 2 +- trunk/Documentation/ioctl-number.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4341f21ab687..f78f5bda67a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c493edd13d633ba556cd71eeae9d062b6912c55d +refs/heads/master: 765d94c1b37d08be02eea6abbff70c0fda0ba984 diff --git a/trunk/Documentation/ioctl-number.txt b/trunk/Documentation/ioctl-number.txt index 5a8bd5bd88ef..8f750c0efed5 100644 --- a/trunk/Documentation/ioctl-number.txt +++ b/trunk/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 -'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