aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2009-04-06 15:10:30 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:30 -0700
commitde15d7fcd6452894e82657fb44b7b93c2afe97a4 (patch)
treee4e56ee8d2afb5bef3baa1db3cdd903b769c1b1a
parent2ce492f5cb8ccb404afff3d29dd6f85dad9bfb01 (diff)
Staging: comedi: 'pcmcia_parse_tuple()' now has two arguments, not three.
This fixes the build error in the cv_das16_cs driver From: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/cb_das16_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 0dd9630cfdf..e7ba3e4288a 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -773,7 +773,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0)
goto cs_failed;
last_fn = ParseTuple;
- if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0)
+ if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
goto cs_failed;
link->conf.ConfigBase = parse.config.base;
link->conf.Present = parse.config.rmask[0];
@@ -798,7 +798,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
if (pcmcia_get_tuple_data(link, &tuple))
goto next_entry;
- if (pcmcia_parse_tuple(link, &tuple, &parse))
+ if (pcmcia_parse_tuple(&tuple, &parse))
goto next_entry;
if (cfg->flags & CISTPL_CFTABLE_DEFAULT)