From: Randy Dunlap <rdunlap@xenotime•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
driverdevel <devel@driverdev•osuosl.org>,
akpm <akpm@linux-foundation•org>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
gregkh <greg@kroah•com>, an Abbott <abbotti@mev•co.uk>,
ori Hess <fmhess@users•sourceforge.net>
Subject: [PATCH -next] staging: fix comedi build when COMEDI_PCI is not enabled
Date: Mon, 22 Aug 2011 11:13:14 -0700 [thread overview]
Message-ID: <20110822111314.bf7a526f.rdunlap@xenotime.net> (raw)
In-Reply-To: <20110822145304.980529cb921e5f1321c622da@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime•net>
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 <rdunlap@xenotime•net>
---
drivers/staging/comedi/drivers/ni_labpc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- linux-next-20110822.orig/drivers/staging/comedi/drivers/ni_labpc.c
+++ linux-next-20110822/drivers/staging/comedi/drivers/ni_labpc.c
@@ -241,8 +241,10 @@ static int labpc_eeprom_write_insn(struc
struct comedi_insn *insn,
unsigned int *data);
static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd);
-#ifdef CONFIG_COMEDI_PCI
+#ifdef CONFIG_ISA_DMA_API
static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd);
+#endif
+#ifdef CONFIG_COMEDI_PCI
static int labpc_find_device(struct comedi_device *dev, int bus, int slot);
#endif
static int labpc_dio_mem_callback(int dir, int port, int data,
next prev parent reply other threads:[~2011-08-22 18:13 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 4:53 linux-next: Tree for Aug 22 Stephen Rothwell
2011-08-22 16:10 ` linux-next: Tree for Aug 22 (drivers/power/pda_power.c) Randy Dunlap
2011-08-22 18:13 ` Randy Dunlap [this message]
2011-08-23 18:58 ` [PATCH -next] staging: fix comedi build when COMEDI_PCI is not enabled Greg KH
2011-08-23 20:03 ` Randy Dunlap
2011-08-22 18:30 ` [PATCH -next] power_supply: fix sysfs format warning Randy Dunlap
2011-08-23 13:27 ` Anton Vorontsov
2011-08-22 19:53 ` linux-next: Tree for Aug 22 (evm) Randy Dunlap
2011-08-22 20:18 ` Arnaud Lacombe
2011-08-23 0:47 ` Arnaud Lacombe
2011-08-23 0:49 ` Randy Dunlap
2011-08-23 2:09 ` Mimi Zohar
2011-08-23 2:24 ` Arnaud Lacombe
2011-08-24 2:07 ` Mimi Zohar
2011-08-23 2:32 ` Arnaud Lacombe
2011-08-23 23:40 ` Randy Dunlap
2011-08-24 2:10 ` Arnaud Lacombe
2011-08-26 12:39 ` Mimi Zohar
2011-08-26 17:00 ` Randy Dunlap
2011-08-27 6:06 ` Arnaud Lacombe
2011-09-02 0:32 ` Arnaud Lacombe
2011-09-02 1:40 ` Mimi Zohar
2011-09-02 2:21 ` Arnaud Lacombe
2011-09-02 15:01 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110822111314.bf7a526f.rdunlap@xenotime.net \
--to=rdunlap@xenotime$(echo .)net \
--cc=abbotti@mev$(echo .)co.uk \
--cc=akpm@linux-foundation$(echo .)org \
--cc=devel@driverdev$(echo .)osuosl.org \
--cc=fmhess@users$(echo .)sourceforge.net \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox