Patchwork mips_fulong: remove bogus HAS_AUDIO

login
register
mail settings
Submitter Isaku Yamahata
Date Jan. 21, 2011, 10:53 a.m.
Message ID <5ad4848d74202246a4542ad0083c7695f071a873.1295607122.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/79824/
State New
Headers show

Comments

Isaku Yamahata - Jan. 21, 2011, 10:53 a.m.
remove bogus HAS_AUDIO according to 738012bec4c67e697e766edadab3f522c552a04d.

Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Huacai Chen <zltjiangshi@gmail.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/mips_fulong2e.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
Aurelien Jarno - Jan. 25, 2011, 8:23 a.m.
On Fri, Jan 21, 2011 at 07:53:51PM +0900, Isaku Yamahata wrote:
> remove bogus HAS_AUDIO according to 738012bec4c67e697e766edadab3f522c552a04d.
> 
> Cc: Blue Swirl <blauwirbel@gmail.com>
> Cc: Huacai Chen <zltjiangshi@gmail.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> ---
>  hw/mips_fulong2e.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)

Thanks, applied.

> 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();
>  }
> -- 
> 1.7.1.1
> 
> 
>

Patch

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();
 }