summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/at91_cf.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2007-02-13 22:39:27 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-16 15:19:18 -0800
commite4a3c3f095ecc760fc557ca87e518e2e553fab4b (patch)
tree5130e67db3849f3a10a936734ce75da7a82f3bca /drivers/pcmcia/at91_cf.c
parent4aca67e5f54bf6ee439b5bdbc77007a547ad5b43 (diff)
downloadop-kernel-dev-e4a3c3f095ecc760fc557ca87e518e2e553fab4b.zip
op-kernel-dev-e4a3c3f095ecc760fc557ca87e518e2e553fab4b.tar.gz
pcmcia: some class_device fallout
As found on some arm defconfigs. I only looked at how original patch changes things and other patches fix compilation. ;-) Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pcmcia/at91_cf.c')
-rw-r--r--drivers/pcmcia/at91_cf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index b318628..99baabc 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -277,7 +277,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
board->det_pin, board->irq_pin);
cf->socket.owner = THIS_MODULE;
- cf->socket.dev.dev = &pdev->dev;
+ cf->socket.dev.parent = &pdev->dev;
cf->socket.ops = &at91_cf_ops;
cf->socket.resource_ops = &pccard_static_ops;
cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP
OpenPOWER on IntegriCloud