From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755150Ab0CVQLM (ORCPT ); Mon, 22 Mar 2010 12:11:12 -0400 Received: from cantor.suse.de ([195.135.220.2]:59123 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755144Ab0CVQLJ (ORCPT ); Mon, 22 Mar 2010 12:11:09 -0400 Date: Mon, 22 Mar 2010 17:11:08 +0100 Message-ID: From: Takashi Iwai To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , Jaroslav Kysela Subject: Re: [PATCH -next] sound: fix usb build error when PM is not enabled In-Reply-To: <4BA792F7.8010801@oracle.com> References: <20100322171937.d753bdba.sfr@canb.auug.org.au> <4BA792F7.8010801@oracle.com> 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.1 (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: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 22 Mar 2010 08:55:35 -0700, Randy Dunlap wrote: > > From: Randy Dunlap > > Fix build errors when CONFIG_PM is not enabled: > > sound/usb/card.c:629: error: 'usb_audio_suspend' undeclared here (not in a function) > sound/usb/card.c:630: error: 'usb_audio_resume' undeclared here (not in a function) > > Signed-off-by: Randy Dunlap Applied now. Thanks! Takashi > --- > sound/usb/card.c | 3 +++ > 1 file changed, 3 insertions(+) > > --- linux-next-20100322.orig/sound/usb/card.c > +++ linux-next-20100322/sound/usb/card.c > @@ -606,6 +606,9 @@ static int usb_audio_resume(struct usb_i > > return 0; > } > +#else > +#define usb_audio_suspend NULL > +#define usb_audio_resume NULL > #endif /* CONFIG_PM */ > > static struct usb_device_id usb_audio_ids [] = { >