git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
drivers
/
pcmcia
/
vrc4171_card.c
diff --git
a/drivers/pcmcia/vrc4171_card.c
b/drivers/pcmcia/vrc4171_card.c
index
206e26c
..
b2c4124
100644
(file)
--- a/
drivers/pcmcia/vrc4171_card.c
+++ b/
drivers/pcmcia/vrc4171_card.c
@@
-596,7
+596,7
@@
static int __devinit vrc4171_add_sockets(void)
}
sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot);
}
sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot);
- socket->pcmcia_socket.dev.
dev
= &vrc4171_card_device.dev;
+ socket->pcmcia_socket.dev.
parent
= &vrc4171_card_device.dev;
socket->pcmcia_socket.ops = &vrc4171_pccard_operations;
socket->pcmcia_socket.owner = THIS_MODULE;
socket->pcmcia_socket.ops = &vrc4171_pccard_operations;
socket->pcmcia_socket.owner = THIS_MODULE;
@@
-639,7
+639,7
@@
static int __devinit vrc4171_card_setup(char *options)
int irq;
options += 4;
irq = simple_strtoul(options, &options, 0);
int irq;
options += 4;
irq = simple_strtoul(options, &options, 0);
- if (irq >= 0 && irq <
NR_IRQS
)
+ if (irq >= 0 && irq <
nr_irqs
)
vrc4171_irq = irq;
if (*options != ',')
vrc4171_irq = irq;
if (*options != ',')