diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/net/phy/mdio-gpio.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/net/phy/mdio-gpio.c')
| -rw-r--r-- | drivers/net/phy/mdio-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c index 47c8339a0359..2843c90f712f 100644 --- a/drivers/net/phy/mdio-gpio.c +++ b/drivers/net/phy/mdio-gpio.c | |||
| @@ -241,7 +241,7 @@ MODULE_DEVICE_TABLE(of, mdio_ofgpio_match); | |||
| 241 | 241 | ||
| 242 | static struct platform_driver mdio_ofgpio_driver = { | 242 | static struct platform_driver mdio_ofgpio_driver = { |
| 243 | .driver = { | 243 | .driver = { |
| 244 | .name = "mdio-gpio", | 244 | .name = "mdio-ofgpio", |
| 245 | .owner = THIS_MODULE, | 245 | .owner = THIS_MODULE, |
| 246 | .of_match_table = mdio_ofgpio_match, | 246 | .of_match_table = mdio_ofgpio_match, |
| 247 | }, | 247 | }, |