projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
pcmcia
/
sa1111_badge4.c
diff --git
a/drivers/pcmcia/sa1111_badge4.c
b/drivers/pcmcia/sa1111_badge4.c
index
4d206f4
..
12f0dd0
100644
(file)
--- a/
drivers/pcmcia/sa1111_badge4.c
+++ b/
drivers/pcmcia/sa1111_badge4.c
@@
-132,7
+132,7
@@
static struct pcmcia_low_level badge4_pcmcia_ops = {
.nr = 2,
};
-int pcmcia_badge4_init(struct
device
*dev)
+int pcmcia_badge4_init(struct
sa1111_dev
*dev)
{
int ret = -ENODEV;