projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/iommu-2.6.32
[cascardo/linux.git]
/
arch
/
mn10300
/
kernel
/
mn10300-serial-low.S
diff --git
a/arch/mn10300/kernel/mn10300-serial-low.S
b/arch/mn10300/kernel/mn10300-serial-low.S
index
2244853
..
66702d2
100644
(file)
--- 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