Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / hw / omap_dss.c

diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index a65f5f0..3a92d0a 100644 (file)
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -2190,7 +2190,7 @@ struct omap_dss_s *omap_dss_init(struct omap_mpu_state_s *mpu,
 void omap_rfbi_attach(struct omap_dss_s *s, int cs, struct rfbi_chip_s *chip)
 {
     if (cs < 0 || cs > 1)
-        cpu_abort(cpu_single_env, "%s: wrong CS %i\n", __FUNCTION__, cs);
+        hw_error("%s: wrong CS %i\n", __FUNCTION__, cs);
     s->rfbi.chip[cs] = chip;
 }