From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: [PATCH -next] staging: fix comedi build when COMEDI_PCI is not enabled Date: Tue, 23 Aug 2011 13:03:56 -0700 Message-ID: <20110823130356.dc54f74c.rdunlap@xenotime.net> References: <20110822145304.980529cb921e5f1321c622da@canb.auug.org.au> <20110822111314.bf7a526f.rdunlap@xenotime.net> <20110823185805.GA11786@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy4-pub.bluehost.com ([69.89.21.11]:41871 "HELO oproxy4-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756027Ab1HWUD6 (ORCPT ); Tue, 23 Aug 2011 16:03:58 -0400 In-Reply-To: <20110823185805.GA11786@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH Cc: Stephen Rothwell , driverdevel , akpm , linux-next@vger.kernel.org, LKML , an Abbott , ori Hess On Tue, 23 Aug 2011 11:58:05 -0700 Greg KH wrote: > On Mon, Aug 22, 2011 at 11:13:14AM -0700, Randy Dunlap wrote: > > From: Randy Dunlap > > > > Fix build when CONFIG_ISA_DMA_API is enabled but > > CONFIG_COMEDI_PCI[_DRIVERS] is not enabled. > > Fixes these build errors: > > > > drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_ai_cmd': > > drivers/staging/comedi/drivers/ni_labpc.c:1351: error: implicit declaration of function 'labpc_suggest_transfer_size' > > drivers/staging/comedi/drivers/ni_labpc.c: At top level: > > drivers/staging/comedi/drivers/ni_labpc.c:1802: error: conflicting types for 'labpc_suggest_transfer_size' > > drivers/staging/comedi/drivers/ni_labpc.c:1351: note: previous implicit declaration of 'labpc_suggest_transfer_size' was here > > > > Signed-off-by: Randy Dunlap > > --- > > drivers/staging/comedi/drivers/ni_labpc.c | 4 +++- > > I applied your older patch, which causes this one to not apply. Is it > still needed as well? Nope, the second (more recent) one is not needed. Thanks. --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***