From b7989805342ad6142f050cc616e90f949fa6850a Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Thu, 3 Jun 2010 16:53:49 +1000 Subject: [PATCH] --- yaml --- r: 199711 b: refs/heads/master c: 0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db h: refs/heads/master i: 199709: 2860e316e3891817db31bcfc44e8316f6b00326e 199707: ea7fe467957ad4748c474e739600294511712db8 199703: 28c294c6f6f61f577a3be5f0a761121b70582799 199695: fe14a6c07146b6fe425379c3d36a26ff4640996e 199679: 813dfd27e1233fdb236c6ea57ba88f738697492f v: v3 --- [refs] | 2 +- trunk/drivers/crypto/amcc/crypto4xx_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1ff91afe365c..282908677d64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9aa55e5271a53d28e93fa58759d318b403c15ba +refs/heads/master: 0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db diff --git a/trunk/drivers/crypto/amcc/crypto4xx_core.c b/trunk/drivers/crypto/amcc/crypto4xx_core.c index 9d65b371de64..983530ba04a7 100644 --- a/trunk/drivers/crypto/amcc/crypto4xx_core.c +++ b/trunk/drivers/crypto/amcc/crypto4xx_core.c @@ -1158,7 +1158,7 @@ static int __init crypto4xx_probe(struct of_device *ofdev, struct device *dev = &ofdev->dev; struct crypto4xx_core_device *core_dev; - rc = of_address_to_resource(ofdev->node, 0, &res); + rc = of_address_to_resource(ofdev->dev.of_node, 0, &res); if (rc) return -ENODEV; @@ -1215,13 +1215,13 @@ static int __init crypto4xx_probe(struct of_device *ofdev, (unsigned long) dev); /* Register for Crypto isr, Crypto Engine IRQ */ - core_dev->irq = irq_of_parse_and_map(ofdev->node, 0); + core_dev->irq = irq_of_parse_and_map(ofdev->dev.of_node, 0); rc = request_irq(core_dev->irq, crypto4xx_ce_interrupt_handler, 0, core_dev->dev->name, dev); if (rc) goto err_request_irq; - core_dev->dev->ce_base = of_iomap(ofdev->node, 0); + core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0); if (!core_dev->dev->ce_base) { dev_err(dev, "failed to of_iomap\n"); goto err_iomap;