diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/net/fsl_pq_mdio.c | |
| parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
| parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/net/fsl_pq_mdio.c')
| -rw-r--r-- | drivers/net/fsl_pq_mdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c index f53f850b641..d4bf91aac25 100644 --- a/drivers/net/fsl_pq_mdio.c +++ b/drivers/net/fsl_pq_mdio.c @@ -265,7 +265,7 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id) #endif -static int fsl_pq_mdio_probe(struct of_device *ofdev, +static int fsl_pq_mdio_probe(struct platform_device *ofdev, const struct of_device_id *match) { struct device_node *np = ofdev->dev.of_node; @@ -425,7 +425,7 @@ err_free_priv: } -static int fsl_pq_mdio_remove(struct of_device *ofdev) +static int fsl_pq_mdio_remove(struct platform_device *ofdev) { struct device *device = &ofdev->dev; struct mii_bus *bus = dev_get_drvdata(device); |