diff options
| author | malc | 2011-08-22 12:41:12 +0200 |
|---|---|---|
| committer | malc | 2011-08-22 12:41:12 +0200 |
| commit | 1afa194a0a3384c5a8fd150e4335d332c22883cf (patch) | |
| tree | 87d1ca2dbfb03128e628e344a713297131bad7f7 /hw/slavio_misc.c | |
| parent | tcg/ppc64: implement not_i32/64 and ext32u_i64 (diff) | |
| parent | Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging (diff) | |
| download | qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.gz qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.xz qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/slavio_misc.c')
| -rw-r--r-- | hw/slavio_misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 198360d573..1f5a2d7330 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -37,13 +37,13 @@ typedef struct MiscState { SysBusDevice busdev; qemu_irq irq; + qemu_irq fdc_tc; uint32_t dummy; uint8_t config; uint8_t aux1, aux2; uint8_t diag, mctrl; uint8_t sysctrl; uint16_t leds; - qemu_irq fdc_tc; } MiscState; typedef struct APCState { |