diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 16:38:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 16:38:02 -0700 |
commit | 7b69a4c360e8787877ebf5e42609b8bab13afa6a (patch) | |
tree | 3eaaae28ed398396f0f3f134e53dd8a730574781 /include/linux | |
parent | a23f4636c9ae7f1f15c448080f1552864b404136 (diff) | |
parent | 68aa2c0d4a36b43ea9c6d77134c94b4501fd2eb4 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] 8250: sysrq deadlock fix
[SERIAL] 8250: add tsi108 serial support
[SERIAL] IP22: fix serial console hangs
[SERIAL] dz: Fix compilation error
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/serial_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 058cba70818..86501a3de2a 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -227,6 +227,7 @@ struct uart_port { #define UPIO_MEM (2) #define UPIO_MEM32 (3) #define UPIO_AU (4) /* Au1x00 type IO */ +#define UPIO_TSI (5) /* Tsi108/109 type IO */ unsigned int read_status_mask; /* driver specific */ unsigned int ignore_status_mask; /* driver specific */ |