diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-07 14:33:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-07 14:33:46 +0100 |
| commit | 5a24f20a7208a58fb80d78ca0521bba6f4d7b145 (patch) | |
| tree | 01f2c35ab535421d039b21b048a9c2ff65ae0d84 /hw | |
| parent | f2155a089600e80cf7bcdc814520ef3304882cc4 (diff) | |
| parent | 9be6e69f12bc65e9c43ee5b8eb026412f11b8b71 (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-04' into staging
trivial patches for 2015-04-04
# gpg: Signature made Sat Apr 4 08:07:49 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-04-04:
vhost: fix typo in vq_index description
gitignore: Ignore more .pod files.
target-tricore: Fix check which was always false
target-i386: remove superfluous TARGET_HAS_SMC macro
pcspk: Fix I/O port name
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/audio/pcspk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 1d81bbe6aa..5266fb5457 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -167,7 +167,7 @@ static void pcspk_initfn(Object *obj) { PCSpkState *s = PC_SPEAKER(obj); - memory_region_init_io(&s->ioport, OBJECT(s), &pcspk_io_ops, s, "elcr", 1); + memory_region_init_io(&s->ioport, OBJECT(s), &pcspk_io_ops, s, "pcspk", 1); } static void pcspk_realizefn(DeviceState *dev, Error **errp) |