diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-10 08:05:35 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-10 08:05:35 -0700 |
| commit | a47fd3f5e3a3f970ac1b81643ac56737f97a1fea (patch) | |
| tree | 09bafe2399f187898ddc6a74176893f0b7f28c6b /drivers/serial/cpm_uart/cpm_uart.h | |
| parent | ef6724e32142c2d9ca252d423cacc435c142734e (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
| download | kernel_samsung_smdk4412-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.zip kernel_samsung_smdk4412-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.tar.gz kernel_samsung_smdk4412-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.tar.bz2 | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
french@hera:~/linux-2.6(0)$ cg-update
l
`/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master' ->
`.git/refs/heads/origin'
cp: cannot create link `.git/objects/info/packs': File exists
progress: 213 objects, 646653 bytes, 77% done
`/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/info/packs' ->
`.git/objects/info/packs'
progress: 983 objects, 2805763 bytes, 100% done
cg-pull: objects pull failed
Diffstat (limited to 'drivers/serial/cpm_uart/cpm_uart.h')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h index 5f6187b..73c8a08 100644 --- a/drivers/serial/cpm_uart/cpm_uart.h +++ b/drivers/serial/cpm_uart/cpm_uart.h @@ -40,13 +40,15 @@ #define TX_NUM_FIFO 4 #define TX_BUF_SIZE 32 +#define SCC_WAIT_CLOSING 100 + struct uart_cpm_port { struct uart_port port; - u16 rx_nrfifos; + u16 rx_nrfifos; u16 rx_fifosize; - u16 tx_nrfifos; + u16 tx_nrfifos; u16 tx_fifosize; - smc_t *smcp; + smc_t *smcp; smc_uart_t *smcup; scc_t *sccp; scc_uart_t *sccup; @@ -67,6 +69,8 @@ struct uart_cpm_port { int bits; /* Keep track of 'odd' SMC2 wirings */ int is_portb; + /* wait on close if needed */ + int wait_closing; }; extern int cpm_uart_port_map[UART_NR]; |