diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-08 22:07:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-08 22:07:51 -0700 |
| commit | 3cbbbd88abec11d2dd35569a28dfcb2d6cd139f0 (patch) | |
| tree | faf814a1e32fd8c637b37f89c8f1f97b1b7bbc5b /include | |
| parent | 7a9df5e2e483eb41aa96228da6cd37d102b0fbb1 (diff) | |
| parent | 3cd30bf04e97ab33123b7c8ccd3dbc1eee531e58 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 5bb8b174ca68..8e09c20be413 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -67,6 +67,12 @@ #define PORT_PC9861 45 #define PORT_PC9801_101 46 +/* DZ */ +#define PORT_DZ 47 + +/* Parisc type numbers. */ +#define PORT_MUX 48 + /* Macintosh Zilog type numbers */ #define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */ #define PORT_PMAC_ZILOG 51 @@ -319,8 +325,8 @@ int uart_remove_one_port(struct uart_driver *reg, struct uart_port *port); /* * Power Management */ -int uart_suspend_port(struct uart_driver *reg, struct uart_port *port, u32 level); -int uart_resume_port(struct uart_driver *reg, struct uart_port *port, u32 level); +int uart_suspend_port(struct uart_driver *reg, struct uart_port *port); +int uart_resume_port(struct uart_driver *reg, struct uart_port *port); #define uart_circ_empty(circ) ((circ)->head == (circ)->tail) #define uart_circ_clear(circ) ((circ)->head = (circ)->tail = 0) |