diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 14:12:55 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 14:13:53 -0500 |
| commit | 7483948fdd31a8642ef0288aab6f368b98d53c29 (patch) | |
| tree | 031020a5553701d2aae8dddb0fa509aa65854eb1 /arch/arm/mach-davinci/board-neuros-osd2.c | |
| parent | 22a416c4e0f2179b57028e084ac0ed2c110333bd (diff) | |
| parent | fe250923bbbbcbccc9aa7b84d05ee7a060450534 (diff) | |
Merge tag 'usb-3.3-rc3' into usb-next
This is done to resolve a merge conflict with:
drivers/usb/class/cdc-wdm.c
and to better handle future patches for this driver as it is under
active development at the moment.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-davinci/board-neuros-osd2.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-neuros-osd2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index 6c4a16415d47..8d34f513d415 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <mach/mmc.h> | 39 | #include <mach/mmc.h> |
| 40 | #include <mach/usb.h> | 40 | #include <mach/usb.h> |
| 41 | 41 | ||
| 42 | #define NEUROS_OSD2_PHY_ID "0:01" | 42 | #define NEUROS_OSD2_PHY_ID "davinci_mdio-0:01" |
| 43 | #define LXT971_PHY_ID 0x001378e2 | 43 | #define LXT971_PHY_ID 0x001378e2 |
| 44 | #define LXT971_PHY_MASK 0xfffffff0 | 44 | #define LXT971_PHY_MASK 0xfffffff0 |
| 45 | 45 | ||