diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-15 07:47:46 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-15 07:47:46 -0800 |
| commit | 9509f9875d154fcf93b25ec487bc13ced8354fa0 (patch) | |
| tree | e64a07e46789732e911200381cbe188a1d5c8041 /include/linux | |
| parent | fba40107b968ffef3ac9091618a20f0fc0a59b8f (diff) | |
| parent | bda2dabecfce94ecbcf155e7a4563b1004933100 (diff) | |
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 1 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index e2e9b9f1c2c9..ba94052020f0 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1235,6 +1235,7 @@ #define PCI_VENDOR_ID_XIRCOM 0x115d #define PCI_DEVICE_ID_XIRCOM_X3201_ETH 0x0003 +#define PCI_DEVICE_ID_XIRCOM_RBM56G 0x0101 #define PCI_DEVICE_ID_XIRCOM_X3201_MDM 0x0103 #define PCI_VENDOR_ID_RENDITION 0x1163 diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 3412f8b7f2ce..80ba519dda77 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -208,12 +208,11 @@ struct uart_state { #define USF_CLOSING_WAIT_NONE (65535) int count; + int pm_state; struct uart_info *info; struct uart_port *port; -#ifdef CONFIG_PM - struct pm_dev *pm; -#endif + struct semaphore sem; }; #define UART_XMIT_SIZE 1024 @@ -224,8 +223,6 @@ struct uart_state { * stuff here. */ struct uart_info { - struct uart_port *port; - struct uart_state *state; struct tty_struct *tty; struct circ_buf xmit; unsigned int flags; @@ -237,7 +234,6 @@ struct uart_info { */ #define UIF_CHECK_CD (1 << 25) #define UIF_CTS_FLOW (1 << 26) -#define UIF_CLOSING (1 << 27) #define UIF_NORMAL_ACTIVE (1 << 29) #define UIF_INITIALIZED (1 << 31) @@ -307,6 +303,12 @@ int uart_register_port(struct uart_driver *reg, struct uart_port *port); int uart_add_one_port(struct uart_driver *reg, struct uart_port *port); 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); + #define uart_circ_empty(circ) ((circ)->head == (circ)->tail) #define uart_circ_clear(circ) ((circ)->head = (circ)->tail = 0) |