[Qemu-devel] [6253] Enable ac97 by default

[Qemu-devel] [6253] Enable ac97 by default

[Anthony Liguori]

Revision: 6253
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6253
Author:   aliguori
Date:     2009-01-08 21:03:55 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Enable ac97 by default

ac97 has drivers for Vista 64-bit whereas sb16 and es1370 do not appear to.  I
asked malc why it was disabled and he said it was because it was GPL.  He did
not object to enabling it now that more QEMU code is GPL'd.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/Makefile.target
    trunk/vl.c

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target	2009-01-08 21:03:07 UTC (rev 6252)
+++ trunk/Makefile.target	2009-01-08 21:03:55 UTC (rev 6253)
@@ -593,10 +593,7 @@
 LIBS += $(CONFIG_OSS_LIB)
 endif
 
-SOUND_HW = sb16.o es1370.o
-ifdef CONFIG_AC97
-SOUND_HW += ac97.o
-endif
+SOUND_HW = sb16.o es1370.o ac97.o
 ifdef CONFIG_ADLIB
 SOUND_HW += fmopl.o adlib.o
 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2009-01-08 21:03:07 UTC (rev 6252)
+++ trunk/vl.c	2009-01-08 21:03:55 UTC (rev 6253)
@@ -4308,7 +4308,6 @@
     },
 #endif
 
-#ifdef CONFIG_AC97
     {
         "ac97",
         "Intel 82801AA AC97 Audio",
@@ -4316,7 +4315,6 @@
         0,
         { .init_pci = ac97_init }
     },
-#endif
 
     {
         "es1370",