diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /Documentation/ioctl-number.txt | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'Documentation/ioctl-number.txt')
| -rw-r--r-- | 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 9228887ab..43b094d5c 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt @@ -74,8 +74,7 @@ Code Seq# Include File Comments 'P' all linux/soundcard.h 'Q' all linux/soundcard.h 'R' all linux/random.h -'S' 00-1F linux/cdrom.h -'S' 20-7F linux/ucdrom.h +'S' 00-7F linux/cdrom.h 'S' 80-81 scsi/scsi_ioctl.h 'S' 82-FF scsi/scsi.h 'T' all linux/soundcard.h conflict! |