From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1756705AbYLECRZ@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756705AbYLECRZ (ORCPT <rfc822;w@1wt.eu>);
	Thu, 4 Dec 2008 21:17:25 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751953AbYLECRQ
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 4 Dec 2008 21:17:16 -0500
Received: from ns1.suse.de ([195.135.220.2]:47693 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751884AbYLECRP (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 4 Dec 2008 21:17:15 -0500
Date: Fri, 05 Dec 2008 03:17:13 +0100
Message-ID: <s5h7i6fgyc6.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: akpm <akpm@linux-foundation.org>, lkml <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -next] sound: fix ca0106 for CONFIG_PM=n
In-Reply-To: <20081204092657.fb1039c7.randy.dunlap@oracle.com>
References: <20081204092657.fb1039c7.randy.dunlap@oracle.com>
User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.3
 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI)
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

1At Thu, 4 Dec 2008 09:26:57 -0800,
Randy Dunlap wrote:
> 
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix build error when CONFIG_PM=n:
> 
> sound/pci/ca0106/ca0106_main.c:1809: error: 'snd_ca0106_suspend' undeclared here (not in a function)
> sound/pci/ca0106/ca0106_main.c:1810: error: 'snd_ca0106_resume' undeclared here (not in a function)
> build-r7018.out:make[4]: *** [sound/pci/ca0106/ca0106_main.o] Error 1
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks.  This was already fixed on the latest sound git tree.
Should be fine in today's upcoming next linux-tree.


Takashi


> ---
>  sound/pci/ca0106/ca0106_main.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> --- linux-next-20081204.orig/sound/pci/ca0106/ca0106_main.c
> +++ linux-next-20081204/sound/pci/ca0106/ca0106_main.c
> @@ -1791,6 +1791,10 @@ static int snd_ca0106_resume(struct pci_
>  	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
>  	return 0;
>  }
> +
> +#else /* not CONFIG_PM */
> +#define snd_ca0106_suspend	NULL
> +#define snd_ca0106_resume	NULL
>  #endif
>  
>  // PCI IDs
>