From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LL22n-0003XE-M4
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 16:03:57 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LL22m-0003Wq-Vg
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 16:03:57 -0500
Received: from [199.232.76.173] (port=49979 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LL22m-0003Wj-Qz
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 16:03:56 -0500
Received: from savannah.gnu.org ([199.232.41.3]:59721 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LL22m-00083r-B7
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 16:03:56 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LL22l-0008I0-Sw
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 21:03:55 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LL22l-0008Hw-HZ
	for qemu-devel@nongnu.org; Thu, 08 Jan 2009 21:03:55 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LL22l-0008Hw-HZ@cvs.savannah.gnu.org>
Date: Thu, 08 Jan 2009 21:03:55 +0000
Subject: [Qemu-devel] [6253] Enable ac97 by default
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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",