diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-15 10:08:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-15 10:08:46 +0000 |
| commit | df58887b20fab8fe8a6dcca4db30cd4e4077d53a (patch) | |
| tree | f4831cf96c57d4974e6fe6d61b5ee98114de72e0 /include/hw/hotplug.h | |
| parent | b629a38a13745d62d44de8ebb00f4e38ec6d8f7e (diff) | |
| parent | 99efa84d5c02e33bcca7be83dd7cabc4b0f22f14 (diff) | |
| download | focaccia-qemu-df58887b20fab8fe8a6dcca4db30cd4e4077d53a.tar.gz focaccia-qemu-df58887b20fab8fe8a6dcca4db30cd4e4077d53a.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-01-15' into staging
trivial patches for 2015-01-15 # gpg: Signature made Thu 15 Jan 2015 08:26:26 GMT 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-01-15: vl.c: fix some alignment issues blizzard: do not depend on VGA internals Makefile: Remove config.status and common.env during 'make distclean' target-openrisc: bugfix for dec_sys to decode instructions correctly Do not hang on full PTY misc: Fix new typos in comments target-arm: Fix typo in comment (seperately -> separately) target-tricore: Fix new typos migration/qemu-file.c: Don't shift left into sign bit translate-all: Mark map_exec() with the 'unused' attribute tests/hd-geo-test.c: Remove unused test_image variable vt82c686: avoid out-of-bounds read Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/hotplug.h')
| -rw-r--r-- | include/hw/hotplug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/hotplug.h b/include/hw/hotplug.h index 050d2f0530..2db025d0bd 100644 --- a/include/hw/hotplug.h +++ b/include/hw/hotplug.h @@ -52,7 +52,7 @@ typedef void (*hotplug_fn)(HotplugHandler *plug_handler, * require asynchronous unplug handling. * @unplug: unplug callback. * Used for device removal with devices that implement - * asynchronous and synchronous (suprise) removal. + * asynchronous and synchronous (surprise) removal. */ typedef struct HotplugHandlerClass { /* <private> */ |