From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753158Ab1AKGlA (ORCPT <rfc822;w@1wt.eu>);
	Tue, 11 Jan 2011 01:41:00 -0500
Received: from cantor2.suse.de ([195.135.220.15]:47118 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751320Ab1AKGk5 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 11 Jan 2011 01:40:57 -0500
Date: Tue, 11 Jan 2011 07:40:56 +0100
Message-ID: <s5hei8kj62v.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Clemens Ladisch <clemens@ladisch.de>
Subject: Re: linux-next: build failure after merge of the final tree (sound tree related)
In-Reply-To: <20110111132030.3179e682.sfr@canb.auug.org.au>
References: <20110111132030.3179e682.sfr@canb.auug.org.au>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.2
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Tue, 11 Jan 2011 13:20:30 +1100,
Stephen Rothwell wrote:
> 
> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> sound/pci/oxygen/xonar_dg.c: In function 'dg_output_enable':
> sound/pci/oxygen/xonar_dg.c:138: error: implicit declaration of function 'msleep'
> 
> Caused by commit 66410bfdf14f7c2ad3b2d4a8adeab41d368b6f05 ("ALSA: oxygen:
> add Xonar DG support").
> 
> See Rule 1 in Documentation/SubmitChecklist.
> 
> I added the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 11 Jan 2011 13:17:16 +1100
> Subject: [PATCH] ALSA: include delay.h for msleep in Xonar DG support
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen, applied the patch now to sound git tree.


Takashi

> ---
>  sound/pci/oxygen/xonar_dg.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/pci/oxygen/xonar_dg.c b/sound/pci/oxygen/xonar_dg.c
> index cc610ac1..dd45cf4 100644
> --- a/sound/pci/oxygen/xonar_dg.c
> +++ b/sound/pci/oxygen/xonar_dg.c
> @@ -40,6 +40,7 @@
>   */
>  
>  #include <linux/pci.h>
> +#include <linux/delay.h>
>  #include <sound/control.h>
>  #include <sound/core.h>
>  #include <sound/info.h>
> -- 
> 1.7.2.3
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>