diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-01-31 15:13:14 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-01-31 15:13:14 +0000 |
| commit | 6a78996e768731f8018c2081dbbcec2d48027a89 (patch) | |
| tree | 50e23602247ee97b74043a661293341ed465f96e /target/linux/amazon/files/drivers/serial/amazon_asc.c | |
| parent | 4d1bfc37607ebbd9842c2555bd4ded9c0c231649 (diff) | |
| download | master-31e0f0ae-6a78996e768731f8018c2081dbbcec2d48027a89.tar.gz master-31e0f0ae-6a78996e768731f8018c2081dbbcec2d48027a89.tar.bz2 master-31e0f0ae-6a78996e768731f8018c2081dbbcec2d48027a89.zip | |
Add kernel 2.6.32 support
SVN-Revision: 19458
Diffstat (limited to 'target/linux/amazon/files/drivers/serial/amazon_asc.c')
| -rw-r--r-- | target/linux/amazon/files/drivers/serial/amazon_asc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/amazon/files/drivers/serial/amazon_asc.c b/target/linux/amazon/files/drivers/serial/amazon_asc.c index f7fa907b00..fe7050c790 100644 --- a/target/linux/amazon/files/drivers/serial/amazon_asc.c +++ b/target/linux/amazon/files/drivers/serial/amazon_asc.c @@ -108,10 +108,10 @@ static void amazonasc_enable_ms(struct uart_port *port) static void amazonasc_rx_chars(struct uart_port *port) { -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 26)) - struct tty_struct *tty = port->info->port.tty; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31)) + struct tty_struct *tty = port->state->port.tty; #else - struct tty_struct *tty = port->info->tty; + struct tty_struct *tty = port->info->port.tty; #endif unsigned int ch = 0, rsr = 0, fifocnt; @@ -169,7 +169,11 @@ amazonasc_rx_chars(struct uart_port *port) static void amazonasc_tx_chars(struct uart_port *port) { +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31)) + struct circ_buf *xmit = &port->state->xmit; +#else struct circ_buf *xmit = &port->info->xmit; +#endif if (uart_tx_stopped(port)) { amazonasc_stop_tx(port); @@ -679,7 +683,7 @@ static int __init amazon_asc_probe(struct platform_device *dev) return res; } -static int __exit amazon_asc_remove(struct platform_device *dev) +static int amazon_asc_remove(struct platform_device *dev) { uart_unregister_driver(&amazonasc_reg); return 0; |