aboutsummaryrefslogtreecommitdiff
path: root/include/hw/virtio
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-05-24 11:38:22 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-05-24 11:38:22 +0100
commitb0f6ef8915247f3230ffd9b71af9c3dadb6082c7 (patch)
tree81eb4004395c7823c71541eb47c3e843d26ebf43 /include/hw/virtio
parent4c63a818de8d77bda3332c890fc52d900ebb2db1 (diff)
parentcde63615343fb241f4044e6471e6e25be78574c8 (diff)
Merge remote-tracking branch 'remotes/amit-virtio-rng/tags/rng-2.7-1' into staging
rng: rename RndRandom to RndRandom # gpg: Signature made Mon 23 May 2016 16:44:58 BST using RSA key ID 657EF670 # gpg: Good signature from "Amit Shah <amit@amitshah.net>" # gpg: aka "Amit Shah <amit@kernel.org>" # gpg: aka "Amit Shah <amitshah@gmx.net>" * remotes/amit-virtio-rng/tags/rng-2.7-1: rng-random: rename RndRandom to RngRandom Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/virtio')
-rw-r--r--include/hw/virtio/virtio-rng.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h
index 3f07de70c7..2bc1ee5b50 100644
--- a/include/hw/virtio/virtio-rng.h
+++ b/include/hw/virtio/virtio-rng.h
@@ -26,7 +26,7 @@ struct VirtIORNGConf {
RngBackend *rng;
uint64_t max_bytes;
uint32_t period_ms;
- RndRandom *default_backend;
+ RngRandom *default_backend;
};
typedef struct VirtIORNG {