From e2819e52a162873ff5061de81bb749831bdb5de9 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Wed, 6 Aug 1997 19:14:48 +0000 Subject: Merge to 2.1.38. IMPORTANT NOTE: I could not figure out what information is the one that should be used for the following files (ie, those that were in our tree, or those that came from Linus' patch), please, check these: include/asm-mips/jazz.h include/asm-mips/jazzdma.h include/asm-mips/ioctls.h --- include/asm-m68k/serial.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm-m68k') diff --git a/include/asm-m68k/serial.h b/include/asm-m68k/serial.h index 7c873c341..607b408ec 100644 --- a/include/asm-m68k/serial.h +++ b/include/asm-m68k/serial.h @@ -31,7 +31,7 @@ #define SER_AMIGA 105 /* Amiga built-in serial port */ #define SER_IOEXT 106 /* Amiga GVP IO-Extender (16c552) */ #define SER_MFC_III 107 /* Amiga BSC Multiface Card III (MC68681) */ - +#define SER_WHIPPET 108 /* Amiga Hisoft Whippet PCMCIA (16c550B) */ struct serial_struct { int type; -- cgit v1.2.3