diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
| commit | cecd77ae6df060bbe8f0eea6691112097e680a52 (patch) | |
| tree | 4c82bcf59884c6555cb0199a1f96a26a2dfaf83a /hw/sdhci.c | |
| parent | f9308207040dc4a1484cee459bedaec03645b935 (diff) | |
| parent | 01ed1d527c59356e6c4c9d54b5710a3c9e78ce4e (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By liguang (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
qdev: remove redundant abort()
gitignore: ignore more files
Use proper term in TCG README
serial: Fix debug format strings
Fix typos and misspellings
Advertise --libdir in configure --help output
memory: fix a bug of detection of memory region collision
MinGW: Replace setsockopt by qemu_setsocketopt
Diffstat (limited to 'hw/sdhci.c')
| -rw-r--r-- | hw/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sdhci.c b/hw/sdhci.c index 93feada049..4a29e6cf7f 100644 --- a/hw/sdhci.c +++ b/hw/sdhci.c @@ -763,7 +763,7 @@ static void sdhci_do_adma(SDHCIState *s) } } - /* we have unfinished bussiness - reschedule to continue ADMA */ + /* we have unfinished business - reschedule to continue ADMA */ qemu_mod_timer(s->transfer_timer, qemu_get_clock_ns(vm_clock) + SDHC_TRANSFER_DELAY); } |