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

[qemu] / hw / cs4231a.c

diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index 25ad409..d08d7c3 100644 (file)
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -636,16 +636,11 @@ static int cs_load(QEMUFile *f, void *opaque, int version_id)
     return 0;
 }
 
-int cs4231a_init (AudioState *audio, qemu_irq *pic)
+int cs4231a_init (qemu_irq *pic)
 {
     int i;
     CSState *s;
 
-    if (!audio) {
-        lerr ("No audio state\n");
-        return -1;
-    }
-
     s = qemu_mallocz (sizeof (*s));
 
     s->pic = pic;
@@ -661,9 +656,9 @@ int cs4231a_init (AudioState *audio, qemu_irq *pic)
     DMA_register_channel (s->dma, cs_dma_read, s);
 
     register_savevm ("cs4231a", 0, 1, cs_save, cs_load, s);
-    qemu_register_reset (cs_reset, s);
+    qemu_register_reset (cs_reset, 0, s);
     cs_reset (s);
 
-    AUD_register_card (audio,"cs4231a", &s->card);
+    AUD_register_card ("cs4231a", &s->card);
     return 0;
 }