From patchwork Fri Jan 21 10:53:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 79824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED01CB6EED for ; Fri, 21 Jan 2011 21:56:47 +1100 (EST) Received: from localhost ([127.0.0.1]:33761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgEfc-0006cv-Jh for incoming@patchwork.ozlabs.org; Fri, 21 Jan 2011 05:56:44 -0500 Received: from [140.186.70.92] (port=32964 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgEct-0006DJ-Bd for qemu-devel@nongnu.org; Fri, 21 Jan 2011 05:53:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PgEcr-0002jK-CB for qemu-devel@nongnu.org; Fri, 21 Jan 2011 05:53:55 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:43575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PgEcr-0002j2-04 for qemu-devel@nongnu.org; Fri, 21 Jan 2011 05:53:53 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id E18D427F87; Fri, 21 Jan 2011 19:53:51 +0900 (JST) Received: (nullmailer pid 18441 invoked by uid 1000); Fri, 21 Jan 2011 10:53:51 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Fri, 21 Jan 2011 19:53:51 +0900 Message-Id: <5ad4848d74202246a4542ad0083c7695f071a873.1295607122.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.1 X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Blue Swirl , yamahata@valinux.co.jp, Aurelien Jarno , Huacai Chen Subject: [Qemu-devel] [PATCH] mips_fulong: remove bogus HAS_AUDIO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org remove bogus HAS_AUDIO according to 738012bec4c67e697e766edadab3f522c552a04d. Cc: Blue Swirl Cc: Huacai Chen Cc: Aurelien Jarno Signed-off-by: Isaku Yamahata --- hw/mips_fulong2e.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index 07eb9ee..2783ed5 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -218,13 +218,11 @@ uint8_t eeprom_spd[0x80] = { }; /* Audio support */ -#ifdef HAS_AUDIO static void audio_init (PCIBus *pci_bus) { vt82c686b_ac97_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 5)); vt82c686b_mc97_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 6)); } -#endif /* Network support */ static void network_init (void) @@ -391,9 +389,7 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device, } /* Sound card */ -#ifdef HAS_AUDIO audio_init(pci_bus); -#endif /* Network card */ network_init(); }