From 92c7311b1cb354745ec7b59b0e03910b3fe4c205 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 5 Mar 2009 14:34:31 -0800
Subject: auto import from //depot/cupcake/@136594

---
 hw/android_arm.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'hw/android_arm.c')

diff --git a/hw/android_arm.c b/hw/android_arm.c
index efc8ba1..ae21be8 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -22,7 +22,6 @@
 
 #define ARM_CPU_SAVE_VERSION  1
 
-int android_audio_enabled;
 char* audio_input_source = NULL;
 
 void goldfish_memlog_init(uint32_t base);
@@ -116,10 +115,8 @@ static void android_arm_init(ram_addr_t ram_size, int vga_ram_size,
 
     goldfish_fb_init(ds, 0);
 #ifdef HAS_AUDIO
-    if (android_audio_enabled) {
-        AUD_init();
-        goldfish_audio_init(0xff004000, 0, audio_input_source);
-    }
+    AUD_init();
+    goldfish_audio_init(0xff004000, 0, audio_input_source);
 #endif
     {
         int  idx = drive_get_index( IF_IDE, 0, 0 );
@@ -171,5 +168,7 @@ QEMUMachine android_arm_machine = {
     "android_arm",
     "ARM Android Emulator",
     android_arm_init,
+    0,
+    0,
     NULL
 };
-- 
cgit v1.1