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/m8xx_pcmcia.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/m8xx_pcmcia.c')
-rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index d059c9196172..9721ed7bf502 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1321,7 +1321,7 @@ static int __init m8xx_init(void) | |||
1321 | socket[i].socket.ops = &m8xx_services; | 1321 | socket[i].socket.ops = &m8xx_services; |
1322 | socket[i].socket.resource_ops = &pccard_iodyn_ops; | 1322 | socket[i].socket.resource_ops = &pccard_iodyn_ops; |
1323 | socket[i].socket.cb_dev = NULL; | 1323 | socket[i].socket.cb_dev = NULL; |
1324 | socket[i].socket.dev.dev = &m8xx_device.dev; | 1324 | socket[i].socket.dev.parent = &m8xx_device.dev; |
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | for (i = 0; i < PCMCIA_SOCKETS_NO; i++) | 1327 | for (i = 0; i < PCMCIA_SOCKETS_NO; i++) |