diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-04 07:07:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-04 07:07:51 -0800 |
| commit | 58561763197b0656a8fffbcd464c99f0bccfa10a (patch) | |
| tree | cab789aadbbd04993848f3f0df10d1321457b94c /include | |
| parent | 757daad040d35ab36d0e4303b329f26480526198 (diff) | |
| parent | bb3ddc318e8fc1f0bca18c1d86403c01370fe9df (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 3fad76b0873c..9666c572f65b 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -91,12 +91,15 @@ /* MPC52xx type numbers */ #define PORT_MPC52xx 59 -/*IBM icom*/ -#define PORT_ICOM 60 +/* IBM icom */ +#define PORT_ICOM 60 /* Samsung S3C2440 SoC */ #define PORT_S3C2440 61 +/* Motorola i.MX SoC */ +#define PORT_IMX 62 + #ifdef __KERNEL__ #include <linux/config.h> @@ -241,11 +244,11 @@ struct uart_port { * within. */ struct uart_state { - unsigned int close_delay; - unsigned int closing_wait; + unsigned int close_delay; /* msec */ + unsigned int closing_wait; /* msec */ #define USF_CLOSING_WAIT_INF (0) -#define USF_CLOSING_WAIT_NONE (65535) +#define USF_CLOSING_WAIT_NONE (~0U) int count; int pm_state; |