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/m32r_cfc.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/m32r_cfc.c')
-rw-r--r-- | drivers/pcmcia/m32r_cfc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index e4a94108aab9..91da15b5a81e 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
@@ -760,7 +760,7 @@ static int __init init_m32r_pcc(void) | |||
760 | /* Set up interrupt handler(s) */ | 760 | /* Set up interrupt handler(s) */ |
761 | 761 | ||
762 | for (i = 0 ; i < pcc_sockets ; i++) { | 762 | for (i = 0 ; i < pcc_sockets ; i++) { |
763 | socket[i].socket.dev.dev = &pcc_device.dev; | 763 | socket[i].socket.dev.parent = &pcc_device.dev; |
764 | socket[i].socket.ops = &pcc_operations; | 764 | socket[i].socket.ops = &pcc_operations; |
765 | socket[i].socket.resource_ops = &pccard_nonstatic_ops; | 765 | socket[i].socket.resource_ops = &pccard_nonstatic_ops; |
766 | socket[i].socket.owner = THIS_MODULE; | 766 | socket[i].socket.owner = THIS_MODULE; |