commit 4c9b53e3ff97dba4336fdf18451add801385d364
author malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Jan 09 10:46:34 2009 +0000
committer malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Jan 09 10:46:34 2009 +0000
tree ed75db4010df312da0c382b3ae9234a346043ff8
parent 6b419964d5f7e4a13bba11f21f73e8ed96705305

More flexible audio card selection

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6258 c046a42c-6fe2-441c-8c8c-71466251a162

vl.c

diff --git a/vl.c b/vl.c
index 9a9410b..e29072b 100644
--- a/vl.c
+++ b/vl.c
@@ -4266,6 +4266,8 @@
         { .init_isa = pcspk_audio_init }
     },
 #endif
+
+#ifdef CONFIG_SB16
     {
         "sb16",
         "Creative Sound Blaster 16",
@@ -4273,6 +4275,7 @@
         1,
         { .init_isa = SB16_init }
     },
+#endif
 
 #ifdef CONFIG_CS4231A
     {
@@ -4308,6 +4311,7 @@
     },
 #endif
 
+#ifdef CONFIG_AC97
     {
         "ac97",
         "Intel 82801AA AC97 Audio",
@@ -4315,7 +4319,9 @@
         0,
         { .init_pci = ac97_init }
     },
+#endif
 
+#ifdef CONFIG_ES1370
     {
         "es1370",
         "ENSONIQ AudioPCI ES1370",
@@ -4325,6 +4331,8 @@
     },
 #endif
 
+#endif /* HAS_AUDIO_CHOICE */
+
     { NULL, NULL, 0, 0, { NULL } }
 };