fix merge conflict

diff --cc hw/blizzard.c
Simple merge

diff --cc hw/omap.h
index ceaec73,52ab9fc..9923561
--- 1/hw/omap.h
--- 2/hw/omap.h
+++ b/hw/omap.h
@@@ -934,10 -934,10 +934,10 @@@ struct omap3_lcd_panel_s 
  struct omap_dss_s;
  void omap_dss_reset(struct omap_dss_s *s);
  struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
 -                target_phys_addr_t l3_base, DisplayState *ds,
 +                target_phys_addr_t l3_base,
                  qemu_irq irq, qemu_irq drq,
                  omap_clk fck1, omap_clk fck2, omap_clk ck54m,
-                 omap_clk ick1, omap_clk ick2);
+                 omap_clk ick1, omap_clk ick2, int region_start);
  void omap_rfbi_attach(struct omap_dss_s *s, int cs, struct rfbi_chip_s *chip);
  void omap3_lcd_panel_attach(struct omap_dss_s *s, int cs, struct omap3_lcd_panel_s *lcd_panel);
  void *omap3_lcd_panel_init(DisplayState *ds);

diff --cc hw/omap2.c
Simple merge

diff --cc hw/omap3.c
index 6881e5d,2058612..3fd5c0f
--- 1/hw/omap3.c
--- 2/hw/omap3.c
+++ b/hw/omap3.c
@@@ -4159,9 -4159,9 +4159,9 @@@ struct omap_mpu_state_s *omap3530_mpu_i
      /*attach serial[0] to uart 2 for beagle board */
      omap_uart_attach(s->uart[2], serial_hds[0]);
  
 -    s->dss = omap_dss_init(omap3_l4ta_get(s->l4, L4A_DSS), 0x68005400, ds,
 +    s->dss = omap_dss_init(omap3_l4ta_get(s->l4, L4A_DSS), 0x68005400, 
                      s->irq[0][OMAP_INT_35XX_DSS_IRQ], s->drq[OMAP24XX_DMA_DSS],
-                    NULL,NULL,NULL,NULL,NULL);
+                    NULL,NULL,NULL,NULL,NULL,1);
  
      //gpio_clks[0] = NULL;
      //gpio_clks[1] = NULL;

diff --cc hw/omap_dss.c
index a2b0f10,f339a1c..9da438c
--- 1/hw/omap_dss.c
--- 2/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@@ -1068,10 -1068,10 +1068,10 @@@ static CPUWriteMemoryFunc *omap_im3_wri
  };
  
  struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
-                 target_phys_addr_t l3_base,
-                 qemu_irq irq, qemu_irq drq,
-                 omap_clk fck1, omap_clk fck2, omap_clk ck54m,
-                 omap_clk ick1, omap_clk ick2)
 -                                 target_phys_addr_t l3_base, DisplayState *ds,
++                                 target_phys_addr_t l3_base,
+                                  qemu_irq irq, qemu_irq drq,
+                                  omap_clk fck1, omap_clk fck2, omap_clk ck54m,
+                                  omap_clk ick1, omap_clk ick2, int region_base)
  {
      int iomemtype[6];
      struct omap_dss_s *s = (struct omap_dss_s *)
@@@ -1092,17 -1093,12 +1092,17 @@@
      iomemtype[4] = cpu_register_io_memory(0, omap_im3_readfn,
                                            omap_im3_writefn, s);
      /* TODO: DSI */
-     omap_l4_attach(ta, 1, iomemtype[0]);
-     omap_l4_attach(ta, 2, iomemtype[1]);
-     omap_l4_attach(ta, 3, iomemtype[2]);
-     omap_l4_attach(ta, 4, iomemtype[3]);
+     omap_l4_attach(ta, region_base+0, iomemtype[0]);
+     omap_l4_attach(ta, region_base+1, iomemtype[1]);
+     omap_l4_attach(ta, region_base+2, iomemtype[2]);
+     omap_l4_attach(ta, region_base+3, iomemtype[3]);
      cpu_register_physical_memory(l3_base, 0x1000, iomemtype[4]);
  
 +#if 0
 +    s->state = graphic_console_init(omap_update_display,
 +                                    omap_invalidate_display, omap_screen_dump, s);
 +#endif
 +
      return s;
  }