patch-pre2.0.9 linux/Documentation/ioctl-number.txt

Next file: linux/MAINTAINERS
Previous file: linux/net/ipv4/ip_fw.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.8/linux/Documentation/ioctl-number.txt linux/Documentation/ioctl-number.txt
@@ -55,7 +55,6 @@
 Ioctl	Include File		Comments
 ========================================================
 0x00	linux/fs.h		only FIBMAP, FIGETBSZ
-0x00	linux/mc146818rtc.h	conflict!
 0x02	linux/fd.h
 0x03	linux/hdreg.h
 0x04	linux/umsdos_fs.h
@@ -90,6 +89,7 @@
 'm'	linux/mtio.h		conflict!
 'm'	linux/soundcard.h	conflict!
 'n'	linux/ncp_fs.h
+'p'	linux/mc146818rtc.h
 'r'	linux/msdos_fs.h
 's'	linux/cdk.h
 't'	linux/if_ppp.h		no conflict

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this