diff options
| author | Anthony Liguori | 2011-05-12 15:08:12 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-05-12 15:08:12 +0200 |
| commit | 711c21280b2cb56060859cc574221a8bf40f908a (patch) | |
| tree | 9f5385c53ac50e613ae34d4165d02460ef993f0f /hw/syborg_serial.c | |
| parent | Merge remote-tracking branch 'agraf/xen-next' into staging (diff) | |
| parent | lsi53c895a: Rename 'sense' to 'status' (diff) | |
| download | qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.gz qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.xz qemu-711c21280b2cb56060859cc574221a8bf40f908a.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts:
cpu-all.h
Diffstat (limited to 'hw/syborg_serial.c')
| -rw-r--r-- | hw/syborg_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/syborg_serial.c b/hw/syborg_serial.c index df2950fe88..2ef71758b5 100644 --- a/hw/syborg_serial.c +++ b/hw/syborg_serial.c @@ -126,7 +126,7 @@ static void do_dma_tx(SyborgSerialState *s, uint32_t count) s->dma_tx_ptr += count; } /* QEMU char backends do not have a nonblocking mode, so we transmit all - the data imediately and the interrupt status will be unchanged. */ + the data immediately and the interrupt status will be unchanged. */ } /* Initiate RX DMA, and transfer data from the FIFO. */ |