diff options
| author |   Manuel Lauss <mano@roarinelk.homelinux.net> | 2007-02-21 14:47:20 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-23 14:52:09 -0800 |
| commit | dfe461aef0d621d8472d0af343ae8a60866a7a8a (patch) | |
| tree | 7ab7d45113ac74bc3b6e7df8685991052d04a8d7 /drivers/pcmcia/m8xx_pcmcia.c | |
| parent | sysfs: move struct sysfs_dirent to private header (diff) | |
| download | linux-dev-dfe461aef0d621d8472d0af343ae8a60866a7a8a.tar.xz linux-dev-dfe461aef0d621d8472d0af343ae8a60866a7a8a.zip | |
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) socket[i].socket.ops = &m8xx_services; socket[i].socket.resource_ops = &pccard_iodyn_ops; socket[i].socket.cb_dev = NULL; - socket[i].socket.dev.dev = &m8xx_device.dev; + socket[i].socket.dev.parent = &m8xx_device.dev; } for (i = 0; i < PCMCIA_SOCKETS_NO; i++) |