diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2014-10-20 16:29:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 14:24:01 -0500 |
commit | cfd1f008c4ee7ba4567f8488fb2dc740bd787151 (patch) | |
tree | 4c074795ca5eedfc137b78471b94bbcce85755ce /drivers/pcmcia/sa1111_generic.c | |
parent | d0439a5442cf43434d87faf34f4d2c19d3aba88a (diff) |
pcmcia: sa1111: pass sa1111_dev to badge4-specific code
Pass sa1111_dev to platform-specific init code, as it is done by lubbock
and neponset. This removes a compilation warnings:
drivers/pcmcia/sa1111_badge4.c: In function 'pcmcia_badge4_init':
drivers/pcmcia/sa1111_badge4.c:147:5: warning: passing argument 1 of 'sa1111_pcmcia_add' from incompatible pointer type [enabled by default]
In file included from drivers/pcmcia/sa1111_badge4.c:26:0:
drivers/pcmcia/sa1111_generic.h:15:5: note: expected 'struct sa1111_dev *' but argument is of type 'struct device *'
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pcmcia/sa1111_generic.c')
-rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 65b02c3e14ce..a353186509cf 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
@@ -197,7 +197,7 @@ static int pcmcia_probe(struct sa1111_dev *dev) | |||
197 | sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + PCCR); | 197 | sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + PCCR); |
198 | 198 | ||
199 | #ifdef CONFIG_SA1100_BADGE4 | 199 | #ifdef CONFIG_SA1100_BADGE4 |
200 | pcmcia_badge4_init(&dev->dev); | 200 | pcmcia_badge4_init(dev); |
201 | #endif | 201 | #endif |
202 | #ifdef CONFIG_SA1100_JORNADA720 | 202 | #ifdef CONFIG_SA1100_JORNADA720 |
203 | pcmcia_jornada720_init(&dev->dev); | 203 | pcmcia_jornada720_init(&dev->dev); |