diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /drivers/serial/samsung.h | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'drivers/serial/samsung.h')
| -rw-r--r-- | drivers/serial/samsung.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h index 571d6b90d206..7afb94843a08 100644 --- a/drivers/serial/samsung.h +++ b/drivers/serial/samsung.h | |||
| @@ -21,6 +21,10 @@ struct s3c24xx_uart_info { | |||
| 21 | unsigned long tx_fifoshift; | 21 | unsigned long tx_fifoshift; |
| 22 | unsigned long tx_fifofull; | 22 | unsigned long tx_fifofull; |
| 23 | 23 | ||
| 24 | /* uart port features */ | ||
| 25 | |||
| 26 | unsigned int has_divslot:1; | ||
| 27 | |||
| 24 | /* clock source control */ | 28 | /* clock source control */ |
| 25 | 29 | ||
| 26 | int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk); | 30 | int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk); |