diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-09 12:30:20 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-09 12:30:20 -0600 |
commit | dac6b1b22cbad29ca34735a1e56c9feb9586e3c0 (patch) | |
tree | 3691bc37b70059c458ad7b5972ff756be56a6a9d /hw | |
parent | bf75fec175d00885c7ae06e5917bde86110c386a (diff) | |
parent | 979ae168e5fac830fcf8ca63fed732051af0611a (diff) | |
download | qemu-dac6b1b22cbad29ca34735a1e56c9feb9586e3c0.zip qemu-dac6b1b22cbad29ca34735a1e56c9feb9586e3c0.tar.gz qemu-dac6b1b22cbad29ca34735a1e56c9feb9586e3c0.tar.bz2 |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: Quote the configure args printed in config.log
osdep: Remove local definition of macro offsetof
libcacard: Spelling and grammar fixes in documentation
Spelling fixes in comments (it's -> its)
vnc: Add break statement
libcacard: Use format specifier %u instead of %d for unsigned values
Fix sign of sscanf format specifiers
block/vmdk: Fix warning from splint (comparision of unsigned value)
qmp: Fix spelling fourty -> forty
qom: Fix spelling in documentation
sh7750: Remove redundant 'struct' from MemoryRegionOps
Diffstat (limited to 'hw')
-rw-r--r-- | hw/exynos4210_mct.c | 2 | ||||
-rw-r--r-- | hw/sh7750.c | 2 | ||||
-rw-r--r-- | hw/sh_intc.c | 2 | ||||
-rw-r--r-- | hw/usb-ccid.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/hw/exynos4210_mct.c b/hw/exynos4210_mct.c index 01e3fb8..7474fcf 100644 --- a/hw/exynos4210_mct.c +++ b/hw/exynos4210_mct.c @@ -888,7 +888,7 @@ static void exynos4210_ltick_event(void *opaque) static uint64_t time2[2] = {0}; #endif - /* Call tick_timer event handler, it will update it's tcntb and icntb */ + /* Call tick_timer event handler, it will update its tcntb and icntb. */ exynos4210_ltick_timer_event(&s->tick_timer); /* get tick_timer cnt */ diff --git a/hw/sh7750.c b/hw/sh7750.c index 4f4d8e7..e712928 100644 --- a/hw/sh7750.c +++ b/hw/sh7750.c @@ -712,7 +712,7 @@ static void sh7750_mmct_write(void *opaque, target_phys_addr_t addr, } } -static const struct MemoryRegionOps sh7750_mmct_ops = { +static const MemoryRegionOps sh7750_mmct_ops = { .read = sh7750_mmct_read, .write = sh7750_mmct_write, .endianness = DEVICE_NATIVE_ENDIAN, diff --git a/hw/sh_intc.c b/hw/sh_intc.c index b24ec77..7d31ced 100644 --- a/hw/sh_intc.c +++ b/hw/sh_intc.c @@ -283,7 +283,7 @@ static void sh_intc_write(void *opaque, target_phys_addr_t offset, #endif } -static const struct MemoryRegionOps sh_intc_ops = { +static const MemoryRegionOps sh_intc_ops = { .read = sh_intc_read, .write = sh_intc_write, .endianness = DEVICE_NATIVE_ENDIAN, diff --git a/hw/usb-ccid.c b/hw/usb-ccid.c index ce01e34..ced687f 100644 --- a/hw/usb-ccid.c +++ b/hw/usb-ccid.c @@ -5,7 +5,7 @@ * * Written by Alon Levy, with contributions from Robert Relyea. * - * Based on usb-serial.c, see it's copyright and attributions below. + * Based on usb-serial.c, see its copyright and attributions below. * * This work is licensed under the terms of the GNU GPL, version 2.1 or later. * See the COPYING file in the top-level directory. |