diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-08-08 00:23:26 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-08-08 01:20:06 -0600 |
| commit | 19e4875fb21a69fbf620e84769a74d189c69c58d (patch) | |
| tree | c9a80978f68b5f60bd6ec2bfb44fbbab27d43c71 | |
| parent | 2dc11581376829303b98eadb2de253bee065a56a (diff) | |
| download | talos-op-linux-19e4875fb21a69fbf620e84769a74d189c69c58d.tar.gz talos-op-linux-19e4875fb21a69fbf620e84769a74d189c69c58d.zip | |
of/sparc: fix build regression from of_device changes
Commit id 1636f8ac2b08410df4766449f7c86b912443cd99 (sparc/of: Move
of_device fields into struct pdev_archdata) missed fixing up the
n2_core.c and greth.c drivers. This patch makes the required changes.
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | drivers/crypto/n2_core.c | 4 | ||||
| -rw-r--r-- | drivers/net/greth.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index 931fdd471d6d..88ee01510ec0 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c @@ -1580,7 +1580,7 @@ static int find_devino_index(struct platform_device *dev, struct spu_mdesc_info if (!dev_intrs) return -ENODEV; - for (i = 0; i < dev->num_irqs; i++) { + for (i = 0; i < dev->archdata.num_irqs; i++) { if (dev_intrs[i] == intr) return i; } @@ -1603,7 +1603,7 @@ static int spu_map_ino(struct platform_device *dev, struct spu_mdesc_info *ip, if (index < 0) return index; - p->irq = dev->irqs[index]; + p->irq = dev->archdata.irqs[index]; sprintf(p->irq_name, "%s-%d", irq_name, index); diff --git a/drivers/net/greth.c b/drivers/net/greth.c index 9ec4b7f28ca4..f15c64f1cd38 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c @@ -1412,7 +1412,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev, const struct } regs = (struct greth_regs *) greth->regs; - greth->irq = ofdev->irqs[0]; + greth->irq = ofdev->archdata.irqs[0]; dev_set_drvdata(greth->dev, dev); SET_NETDEV_DEV(dev, greth->dev); |
