patch-1.3.58 linux/MAGIC

Next file: linux/Makefile
Previous file: linux/Documentation/cdrom/optcd
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.57/linux/MAGIC linux/MAGIC
@@ -74,6 +74,7 @@
 0x06	linux/lp.h
 0x12	linux/fs.h
 0x20	linux/cm206.h
+0x22	linux/scc.h
 'A'	linux/apm_bios.h
 'C'	linux/soundcard.h
 'K'	linux/kd.h
@@ -83,7 +84,6 @@
 'S'	linux/cdrom.h		conflict!
 'S'	linux/scsi.h		conflict!
 'T'	linux/soundcard.h	conflict!
-'T'	linux/scc.h		conflict!
 'T'	asm/termios.h		conflict!
 'V'	linux/vt.h
 'Y'	linux/cyclades.h	codes in 0x004359NN

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