diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-26 15:36:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-26 15:38:02 +0200 |
| commit | 673652a785efb5f7da342b49c80a1abf033c82a7 (patch) | |
| tree | 2f277cce43b50e85cca36d7354ba2dd7ffd14d41 /tests/rtc-test.c | |
| parent | 856bd2c28e108ad0eb909bbbf3774f6f8bd7c2d4 (diff) | |
| parent | df84f17d1beabbb2aca39be18b21afc277cd6754 (diff) | |
| download | qemu-673652a785efb5f7da342b49c80a1abf033c82a7.zip qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.gz qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.bz2 | |
Merge commit 'df84f17' into HEAD
This merge fixes a semantic conflict with the trivial tree.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/rtc-test.c')
| -rw-r--r-- | tests/rtc-test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rtc-test.c b/tests/rtc-test.c index 79a4ff1..c7af34f 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -15,6 +15,7 @@ #include "libqtest-single.h" #include "qemu/timer.h" +#include "hw/rtc/mc146818rtc.h" #include "hw/rtc/mc146818rtc_regs.h" #define UIP_HOLD_LENGTH (8 * NANOSECONDS_PER_SECOND / 32768) |