From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754786Ab1IRIYI (ORCPT ); Sun, 18 Sep 2011 04:24:08 -0400 Received: from out3.smtp.messagingengine.com ([66.111.4.27]:34161 "EHLO out3.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754167Ab1IRIYF (ORCPT ); Sun, 18 Sep 2011 04:24:05 -0400 X-Sasl-enc: TB7NMQNl5msJi33emTkptw1XDlFTqjyg9gTSVTn+YsOI 1316334243 Date: Sun, 18 Sep 2011 01:20:48 -0700 From: Greg KH To: Randy Dunlap Cc: Linux Kernel Mailing List , Greg KH , driverdevel , Andrew Morton , Ian Abbott , Frank Mori Hess Subject: Re: [PATCH] staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled Message-ID: <20110918082048.GA17490@kroah.com> References: <4E68E7F9.4020906@xenotime.net> <20110912145320.GA28855@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110912145320.GA28855@kroah.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 12, 2011 at 04:53:20PM +0200, Greg KH wrote: > On Thu, Sep 08, 2011 at 09:06:17AM -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 > > --- > > > > Greg, I had previously said that this patch was not needed since > > you had merged a larger patch, but I had another build error which > > this patch fixes, so it is now needed in mainline. > > So this is needed in Linus's tree now? Or in linux-next? It doesn't > apply to my staging-next tree so I'm confused. Now dropped from my to-apply queue. If this is still needed, please resend. greg k-h