diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /drivers/serial/jsm/jsm_tty.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'drivers/serial/jsm/jsm_tty.c')
| -rw-r--r-- | drivers/serial/jsm/jsm_tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index 98de2258fd06..6fa0d62d6f68 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c | |||
| @@ -113,7 +113,7 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl) | |||
| 113 | udelay(10); | 113 | udelay(10); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | static void jsm_tty_start_tx(struct uart_port *port, unsigned int tty_start) | 116 | static void jsm_tty_start_tx(struct uart_port *port) |
| 117 | { | 117 | { |
| 118 | struct jsm_channel *channel = (struct jsm_channel *)port; | 118 | struct jsm_channel *channel = (struct jsm_channel *)port; |
| 119 | 119 | ||
| @@ -125,7 +125,7 @@ static void jsm_tty_start_tx(struct uart_port *port, unsigned int tty_start) | |||
| 125 | jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n"); | 125 | jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n"); |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | static void jsm_tty_stop_tx(struct uart_port *port, unsigned int tty_stop) | 128 | static void jsm_tty_stop_tx(struct uart_port *port) |
| 129 | { | 129 | { |
| 130 | struct jsm_channel *channel = (struct jsm_channel *)port; | 130 | struct jsm_channel *channel = (struct jsm_channel *)port; |
| 131 | 131 | ||