diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-17 23:32:45 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-17 23:32:45 +0000 |
| commit | bb382d1cd598a97151a0edf5ac26e36afb0a64ce (patch) | |
| tree | fd9f0ca1b31e5af2faa0d7165e6fd0fbb5524ebf /include/linux | |
| parent | af38bda129551834653720f277a920d7d284bd3d (diff) | |
- IOC3 driver now will panic when encountering a RX/TX PCI DMA error.
- IOC3 driver does no longer use GFP_DMA which given the _very_ small
number of available GFP_DMA pages might have deadlocked the system.
- First cut of Origin support. Last minute change: Do no longer use
ARC memory / MD hub memory configuration information but klconfig.h
stuff. Simpler, faster, shorter.
- Zillions of MIPS64 fixes.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial.h | 1 | ||||
| -rw-r--r-- | include/linux/serialP.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index e1ad16ae6..3cc56b08f 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -95,6 +95,7 @@ struct serial_uart_config { #define ASYNC_FLAGS 0x3FFF /* Possible legal async flags */ #define ASYNC_USR_MASK 0x3430 /* Legal flags that non-privileged * users can set or reset */ +#define ASYNC_IOC3 0x4000 /* SGI IOC3 serial */ /* Internal flags used only by kernel/chr_drv/serial.c */ #define ASYNC_INITIALIZED 0x80000000 /* Serial port was initialized */ diff --git a/include/linux/serialP.h b/include/linux/serialP.h index 02fcb9363..3726d9b5d 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h @@ -39,7 +39,7 @@ struct async_icount { struct serial_state { int magic; int baud_base; - int port; + unsigned long port; int irq; int flags; int hub6; @@ -54,14 +54,14 @@ struct serial_state { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ struct async_icount icount; - struct termios normal_termios; + struct termios normal_termios; struct termios callout_termios; struct async_struct *info; }; struct async_struct { int magic; - int port; + unsigned long port; int hub6; int flags; int xmit_fifo_size; |