diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 23:04:15 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 23:05:20 (GMT) |
| commit | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /arch/arm/mach-ux500/usb.c | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| download | linux-a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13.tar.xz | |
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Diffstat (limited to 'arch/arm/mach-ux500/usb.c')
| -rw-r--r-- | arch/arm/mach-ux500/usb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c index 0a01cbd..9f9e1c2 100644 --- a/arch/arm/mach-ux500/usb.c +++ b/arch/arm/mach-ux500/usb.c @@ -95,13 +95,7 @@ static struct musb_hdrc_config musb_hdrc_config = { }; static struct musb_hdrc_platform_data musb_platform_data = { -#if defined(CONFIG_USB_MUSB_OTG) .mode = MUSB_OTG, -#elif defined(CONFIG_USB_MUSB_PERIPHERAL) - .mode = MUSB_PERIPHERAL, -#else /* defined(CONFIG_USB_MUSB_HOST) */ - .mode = MUSB_HOST, -#endif .config = &musb_hdrc_config, .board_data = &musb_board_data, }; |