diff options
| author | David Howells | 2009-09-23 11:40:24 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-23 19:15:21 +0200 |
| commit | 7043078630bbc9eb908a56e08077c5abe7f2d311 (patch) | |
| tree | 59fdbb36fa304d30f82219f6519bd5d9d866ad28 /arch/mn10300/kernel/mn10300-serial-low.S | |
| parent | FRV: Use asm/generic-hardirq.h (diff) | |
| download | kernel-qcow2-linux-7043078630bbc9eb908a56e08077c5abe7f2d311.tar.gz kernel-qcow2-linux-7043078630bbc9eb908a56e08077c5abe7f2d311.tar.xz kernel-qcow2-linux-7043078630bbc9eb908a56e08077c5abe7f2d311.zip | |
MN10300: Handle removal of struct uart_info
Commit ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 removed struct uart_info and
commit bdc04e3174e18f475289fa8f4144f66686326b7e further moved delta_msr_wait.
Fix up the MN10300 on-chip serial port drivers to comply with this.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mn10300/kernel/mn10300-serial-low.S')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial-low.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial-low.S b/arch/mn10300/kernel/mn10300-serial-low.S index 224485388228..66702d256610 100644 --- a/arch/mn10300/kernel/mn10300-serial-low.S +++ b/arch/mn10300/kernel/mn10300-serial-low.S @@ -130,7 +130,7 @@ ENTRY(mn10300_serial_vdma_tx_handler) or d2,d2 bne mnsc_vdma_tx_xchar - mov (__tx_info_buffer,a3),a2 # get the uart_info struct for Tx + mov (__uart_state,a3),a2 # see if the TTY Tx queue has anything in it mov (__xmit_tail,a2),d3 mov (__xmit_head,a2),d2 cmp d3,d2 |