From 08b240681410751dae130b9a63f7c3ba378b5582 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 11 Jan 2006 11:27:32 -0800 Subject: [PATCH] --- yaml --- r: 18271 b: refs/heads/master c: 1d5326774c9245fef77334a9e0f11cd4f8aa7b4e h: refs/heads/master i: 18269: 14810ee4eb17257d029e8ea20352656627a02bd3 18267: 1d463abc1eef739b2cec9764725e339a3c517a64 18263: 8ca0116566d3ad9a2e583dc264b6e29dfc117838 18255: 9a23728ef11ba7de8291ab8d7a7f77acef653f19 18239: 75b530483e13b4f8c6bb8b9e5ee8dbdb12d90139 v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar_mii.c | 5 ++++- trunk/include/linux/fsl_devices.h | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 895ac7f98cb6..855f5b1e97b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c07b884b92c80e9d660b7b9282631fb626451e2 +refs/heads/master: 1d5326774c9245fef77334a9e0f11cd4f8aa7b4e diff --git a/trunk/drivers/net/gianfar_mii.c b/trunk/drivers/net/gianfar_mii.c index 04a462c2a5b7..74e52fcbf806 100644 --- a/trunk/drivers/net/gianfar_mii.c +++ b/trunk/drivers/net/gianfar_mii.c @@ -128,6 +128,7 @@ int gfar_mdio_probe(struct device *dev) struct gianfar_mdio_data *pdata; struct gfar_mii *regs; struct mii_bus *new_bus; + struct resource *r; int err = 0; if (NULL == dev) @@ -151,8 +152,10 @@ int gfar_mdio_probe(struct device *dev) return -ENODEV; } + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); + /* Set the PHY base address */ - regs = (struct gfar_mii *) ioremap(pdata->paddr, + regs = (struct gfar_mii *) ioremap(r->start, sizeof (struct gfar_mii)); if (NULL == regs) { diff --git a/trunk/include/linux/fsl_devices.h b/trunk/include/linux/fsl_devices.h index 934aa9bda481..a7a2b855ba72 100644 --- a/trunk/include/linux/fsl_devices.h +++ b/trunk/include/linux/fsl_devices.h @@ -55,9 +55,6 @@ struct gianfar_platform_data { }; struct gianfar_mdio_data { - /* device specific information */ - u32 paddr; - /* board specific information */ int irq[32]; };