diff options
author | Manuel Lauss <mano@roarinelk.homelinux.net> | 2007-02-21 08:47:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-23 17:52:09 -0500 |
commit | dfe461aef0d621d8472d0af343ae8a60866a7a8a (patch) | |
tree | 7ab7d45113ac74bc3b6e7df8685991052d04a8d7 /drivers/pcmcia/vrc4171_card.c | |
parent | d56c3eae6753f53d3313b926dcdda38c6c9bbe9b (diff) |
Driver core: more fallout from class_device changes for pcmcia
More fallout from the PCMCIA class_device changes.
The first hunk is run-tested on SH-4, the others are converted
in the spirit of the original conversion.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pcmcia/vrc4171_card.c')
-rw-r--r-- | drivers/pcmcia/vrc4171_card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c index 206e26c91807..eee2f1cb213c 100644 --- a/drivers/pcmcia/vrc4171_card.c +++ b/drivers/pcmcia/vrc4171_card.c | |||
@@ -596,7 +596,7 @@ static int __devinit vrc4171_add_sockets(void) | |||
596 | } | 596 | } |
597 | 597 | ||
598 | sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot); | 598 | sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot); |
599 | socket->pcmcia_socket.dev.dev = &vrc4171_card_device.dev; | 599 | socket->pcmcia_socket.dev.parent = &vrc4171_card_device.dev; |
600 | socket->pcmcia_socket.ops = &vrc4171_pccard_operations; | 600 | socket->pcmcia_socket.ops = &vrc4171_pccard_operations; |
601 | socket->pcmcia_socket.owner = THIS_MODULE; | 601 | socket->pcmcia_socket.owner = THIS_MODULE; |
602 | 602 | ||