aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 11:05:37 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 11:28:48 -0500
commitccbe48f76194b8524d6a8b239a70015245fecbc6 (patch)
tree36acd3223d9f481146010cc5608d947a732473dc /drivers/pcmcia
parent72401339b545a8a0a66411c5a2486f602447d924 (diff)
[PATCH] m32r: class_device -> device fallout
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/m32r_pcc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index bbf025874d0c..4dbef0762376 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -722,7 +722,7 @@ static int __init init_m32r_pcc(void)
722 /* Set up interrupt handler(s) */ 722 /* Set up interrupt handler(s) */
723 723
724 for (i = 0 ; i < pcc_sockets ; i++) { 724 for (i = 0 ; i < pcc_sockets ; i++) {
725 socket[i].socket.dev.dev = &pcc_device.dev; 725 socket[i].socket.dev.parent = &pcc_device.dev;
726 socket[i].socket.ops = &pcc_operations; 726 socket[i].socket.ops = &pcc_operations;
727 socket[i].socket.resource_ops = &pccard_static_ops; 727 socket[i].socket.resource_ops = &pccard_static_ops;
728 socket[i].socket.owner = THIS_MODULE; 728 socket[i].socket.owner = THIS_MODULE;