diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-22 10:27:14 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-22 10:27:14 -0500 |
| commit | bdd2672109caa5cbdd955ef5c7a05b49a6b44fbe (patch) | |
| tree | 14baf544a87d9ff8eed5cbe087a8bc827559e388 /hw/omap_lcdc.c | |
| parent | 27cdad67a1bc23b38c765b677ed8064bfb8d3e44 (diff) | |
| parent | 2654c962b8e06a7203a453b2171daa9269eab544 (diff) | |
| download | qemu-bdd2672109caa5cbdd955ef5c7a05b49a6b44fbe.zip qemu-bdd2672109caa5cbdd955ef5c7a05b49a6b44fbe.tar.gz qemu-bdd2672109caa5cbdd955ef5c7a05b49a6b44fbe.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/omap_lcdc.c')
| -rw-r--r-- | hw/omap_lcdc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index a905422..29e6048 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -24,8 +24,6 @@ struct omap_lcd_panel_s { qemu_irq irq; DisplayState *state; - ram_addr_t imif_base; - ram_addr_t emiff_base; int plm; int tft; @@ -436,8 +434,7 @@ void omap_lcdc_reset(struct omap_lcd_panel_s *s) } struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq, - struct omap_dma_lcd_channel_s *dma, - ram_addr_t imif_base, ram_addr_t emiff_base, omap_clk clk) + struct omap_dma_lcd_channel_s *dma, omap_clk clk) { int iomemtype; struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *) @@ -445,8 +442,6 @@ struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq, s->irq = irq; s->dma = dma; - s->imif_base = imif_base; - s->emiff_base = emiff_base; omap_lcdc_reset(s); iomemtype = cpu_register_io_memory(omap_lcdc_readfn, |