diff --git a/[refs] b/[refs]
index 8e5b5e1926b3..9cb8aad7b1f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72401339b545a8a0a66411c5a2486f602447d924
+refs/heads/master: ccbe48f76194b8524d6a8b239a70015245fecbc6
diff --git a/trunk/drivers/pcmcia/m32r_pcc.c b/trunk/drivers/pcmcia/m32r_pcc.c
index bbf025874d0c..4dbef0762376 100644
--- a/trunk/drivers/pcmcia/m32r_pcc.c
+++ b/trunk/drivers/pcmcia/m32r_pcc.c
@@ -722,7 +722,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_static_ops;
 		socket[i].socket.owner = THIS_MODULE;