summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/m32r_pcc.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 17:05:37 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 17:28:48 +0100
commitccbe48f76194b8524d6a8b239a70015245fecbc6 (patch)
tree36acd3223d9f481146010cc5608d947a732473dc /drivers/pcmcia/m32r_pcc.c
parent[PATCH] ps3 usb missed the addition of new argument to ps3_alloc_io_irq() (diff)
downloadlinux-ccbe48f76194b8524d6a8b239a70015245fecbc6.tar.xz
linux-ccbe48f76194b8524d6a8b239a70015245fecbc6.zip
[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/m32r_pcc.c')
-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)
/* 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;