diff options
| author | Michael S. Tsirkin | 2018-01-11 21:01:17 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2018-01-11 21:03:50 +0100 |
| commit | acc95bc85036c443da8bf7159a77edf9f00dcd80 (patch) | |
| tree | 21965c6e60a2e29664b7685e52feacdb6a86e0bd /include/hw/timer/mc146818rtc.h | |
| parent | smbus: do not immediately complete commands (diff) | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180111'... (diff) | |
| download | qemu-acc95bc85036c443da8bf7159a77edf9f00dcd80.tar.gz qemu-acc95bc85036c443da8bf7159a77edf9f00dcd80.tar.xz qemu-acc95bc85036c443da8bf7159a77edf9f00dcd80.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Resolve conflicts around apb.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'include/hw/timer/mc146818rtc.h')
| -rw-r--r-- | include/hw/timer/mc146818rtc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 7c8e64b203..fe6ed63f71 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -6,7 +6,8 @@ #define TYPE_MC146818_RTC "mc146818rtc" -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, + qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); int rtc_get_memory(ISADevice *dev, int addr); |