aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/m32r_cfc.c
diff options
context:
space:
mode:
authorManuel Lauss <mano@roarinelk.homelinux.net>2007-02-21 14:47:20 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-23 14:52:09 -0800
commitdfe461aef0d621d8472d0af343ae8a60866a7a8a (patch)
tree7ab7d45113ac74bc3b6e7df8685991052d04a8d7 /drivers/pcmcia/m32r_cfc.c
parentd56c3eae6753f53d3313b926dcdda38c6c9bbe9b (diff)
downloadkernel_samsung_smdk4412-dfe461aef0d621d8472d0af343ae8a60866a7a8a.zip
kernel_samsung_smdk4412-dfe461aef0d621d8472d0af343ae8a60866a7a8a.tar.gz
kernel_samsung_smdk4412-dfe461aef0d621d8472d0af343ae8a60866a7a8a.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index e4a9410..91da15b 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -760,7 +760,7 @@ static int __init init_m32r_pcc(void)
/* Set up interrupt handler(s) */
for (i = 0 ; i < pcc_sockets ; i++) {
- socket[i].socket.dev.dev = &pcc_device.dev;
+ socket[i].socket.dev.parent = &pcc_device.dev;
socket[i].socket.ops = &pcc_operations;
socket[i].socket.resource_ops = &pccard_nonstatic_ops;
socket[i].socket.owner = THIS_MODULE;