diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-08-02 00:07:03 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-08-02 00:07:03 +0200 |
| commit | 475d5928b79bb78326a645863d46ff95c5e25e5a (patch) | |
| tree | a260aed0d94bda824d7f2c5d74b2b1f8002634aa /arch/mips/jz4740 | |
| parent | c6b7b9f290c0987194b966d5ea1383e10e1a01b1 (diff) | |
| parent | 1062080a7d8dbe08cefce728341285e77930ef49 (diff) | |
| download | linux-475d5928b79bb78326a645863d46ff95c5e25e5a.tar.gz linux-475d5928b79bb78326a645863d46ff95c5e25e5a.tar.bz2 linux-475d5928b79bb78326a645863d46ff95c5e25e5a.zip | |
Merge branch '3.16-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/jz4740')
| -rw-r--r-- | arch/mips/jz4740/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c index a447101cf9f1..0b12f273cb2e 100644 --- a/arch/mips/jz4740/platform.c +++ b/arch/mips/jz4740/platform.c @@ -59,7 +59,7 @@ struct platform_device jz4740_usb_ohci_device = { /* USB Device Controller */ struct platform_device jz4740_udc_xceiv_device = { - .name = "usb_phy_gen_xceiv", + .name = "usb_phy_generic", .id = 0, }; |