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> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6253 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
c45ca54ff9
commit
b0f3b8fac4
|
@ -593,10 +593,7 @@ ifdef CONFIG_OSS
|
||||||
LIBS += $(CONFIG_OSS_LIB)
|
LIBS += $(CONFIG_OSS_LIB)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SOUND_HW = sb16.o es1370.o
|
SOUND_HW = sb16.o es1370.o ac97.o
|
||||||
ifdef CONFIG_AC97
|
|
||||||
SOUND_HW += ac97.o
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_ADLIB
|
ifdef CONFIG_ADLIB
|
||||||
SOUND_HW += fmopl.o adlib.o
|
SOUND_HW += fmopl.o adlib.o
|
||||||
adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
|
adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
|
||||||
|
|
2
vl.c
2
vl.c
|
@ -4308,7 +4308,6 @@ struct soundhw soundhw[] = {
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_AC97
|
|
||||||
{
|
{
|
||||||
"ac97",
|
"ac97",
|
||||||
"Intel 82801AA AC97 Audio",
|
"Intel 82801AA AC97 Audio",
|
||||||
|
@ -4316,7 +4315,6 @@ struct soundhw soundhw[] = {
|
||||||
0,
|
0,
|
||||||
{ .init_pci = ac97_init }
|
{ .init_pci = ac97_init }
|
||||||
},
|
},
|
||||||
#endif
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"es1370",
|
"es1370",
|
||||||
|
|
Reference in New Issue