Message ID | 1314180683-8227-2-git-send-email-avi@redhat.com |
---|---|
State | New |
Headers | show |
On 24 August 2011 11:11, Avi Kivity <avi@redhat.com> wrote: > Signed-off-by: Avi Kivity <avi@redhat.com> > --- > hw/arm_sysctl.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c > index 17cf6f7..5b845a2 100644 > --- a/hw/arm_sysctl.c > +++ b/hw/arm_sysctl.c > @@ -19,6 +19,7 @@ typedef struct { > SysBusDevice busdev; > MemoryRegion iomem; > qemu_irq pl110_mux_ctrl; > + MemoryRegion iomem; > > uint32_t sys_id; > uint32_t leds; Er, looks like you forgot to squish Richard's compile fix patch? -- PMM
On 08/24/2011 01:23 PM, Peter Maydell wrote: > On 24 August 2011 11:11, Avi Kivity<avi@redhat.com> wrote: > > Signed-off-by: Avi Kivity<avi@redhat.com> > > --- > > hw/arm_sysctl.c | 1 + > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c > > index 17cf6f7..5b845a2 100644 > > --- a/hw/arm_sysctl.c > > +++ b/hw/arm_sysctl.c > > @@ -19,6 +19,7 @@ typedef struct { > > SysBusDevice busdev; > > MemoryRegion iomem; > > qemu_irq pl110_mux_ctrl; > > + MemoryRegion iomem; > > > > uint32_t sys_id; > > uint32_t leds; > > Er, looks like you forgot to squish Richard's compile fix patch? > Not applied yet; will fix.
diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c index 17cf6f7..5b845a2 100644 --- a/hw/arm_sysctl.c +++ b/hw/arm_sysctl.c @@ -19,6 +19,7 @@ typedef struct { SysBusDevice busdev; MemoryRegion iomem; qemu_irq pl110_mux_ctrl; + MemoryRegion iomem; uint32_t sys_id; uint32_t leds;
Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/arm_sysctl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)