diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/fec_mpc52xx_phy.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/fec_mpc52xx_phy.c')
| -rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index 0b4cb6f15984..360a578c2bb7 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c | |||
| @@ -61,8 +61,7 @@ static int mpc52xx_fec_mdio_write(struct mii_bus *bus, int phy_id, int reg, | |||
| 61 | data | FEC_MII_WRITE_FRAME); | 61 | data | FEC_MII_WRITE_FRAME); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | static int mpc52xx_fec_mdio_probe(struct platform_device *of, | 64 | static int mpc52xx_fec_mdio_probe(struct platform_device *of) |
| 65 | const struct of_device_id *match) | ||
| 66 | { | 65 | { |
| 67 | struct device *dev = &of->dev; | 66 | struct device *dev = &of->dev; |
| 68 | struct device_node *np = of->dev.of_node; | 67 | struct device_node *np = of->dev.of_node; |
| @@ -145,7 +144,7 @@ static struct of_device_id mpc52xx_fec_mdio_match[] = { | |||
| 145 | }; | 144 | }; |
| 146 | MODULE_DEVICE_TABLE(of, mpc52xx_fec_mdio_match); | 145 | MODULE_DEVICE_TABLE(of, mpc52xx_fec_mdio_match); |
| 147 | 146 | ||
| 148 | struct of_platform_driver mpc52xx_fec_mdio_driver = { | 147 | struct platform_driver mpc52xx_fec_mdio_driver = { |
| 149 | .driver = { | 148 | .driver = { |
| 150 | .name = "mpc5200b-fec-phy", | 149 | .name = "mpc5200b-fec-phy", |
| 151 | .owner = THIS_MODULE, | 150 | .owner = THIS_MODULE, |