From b0f3b8fac4cf3813b70fa0f2f65be83f9970a286 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 8 Jan 2009 21:03:55 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6253 c046a42c-6fe2-441c-8c8c-71466251a162 --- Makefile.target | 5 +---- vl.c | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index f4f3c703c7..706038555a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -593,10 +593,7 @@ ifdef CONFIG_OSS 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 diff --git a/vl.c b/vl.c index 959be628c9..9a9410b240 100644 --- a/vl.c +++ b/vl.c @@ -4308,7 +4308,6 @@ struct soundhw soundhw[] = { }, #endif -#ifdef CONFIG_AC97 { "ac97", "Intel 82801AA AC97 Audio", @@ -4316,7 +4315,6 @@ struct soundhw soundhw[] = { 0, { .init_pci = ac97_init } }, -#endif { "es1370", -- 2.11.0