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/omap_cf.c | |
| parent | d56c3eae6753f53d3313b926dcdda38c6c9bbe9b (diff) | |
| download | kernel_samsung_smdk4412-dfe461aef0d621d8472d0af343ae8a60866a7a8a.zip kernel_samsung_smdk4412-dfe461aef0d621d8472d0af343ae8a60866a7a8a.tar.gz kernel_samsung_smdk4412-dfe461aef0d621d8472d0af343ae8a60866a7a8a.tar.bz2 | |
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/omap_cf.c')
| -rw-r--r-- | drivers/pcmcia/omap_cf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index 76f7cbc..d77f751 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c @@ -291,7 +291,7 @@ static int __devinit omap_cf_probe(struct device *dev) omap_cf_present() ? "present" : "(not present)"); cf->socket.owner = THIS_MODULE; - cf->socket.dev.dev = dev; + cf->socket.dev.parent = dev; cf->socket.ops = &omap_cf_ops; cf->socket.resource_ops = &pccard_static_ops; cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP |