diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /include/asm-m68k | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
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
Diffstat (limited to 'include/asm-m68k')
| -rw-r--r-- | include/asm-m68k/serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |