diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
| commit | daefd89efc279b142bbb054577c2d706da211723 (patch) | |
| tree | 2298056232548f6f22d7bbff2662a2bbf64520de /arch/arm/mach-ux500/usb.c | |
| parent | 6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff) | |
| parent | f86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff) | |
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
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 0a01cbdfe063..9f9e1c203061 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 = { | |||
| 95 | }; | 95 | }; |
| 96 | 96 | ||
| 97 | static struct musb_hdrc_platform_data musb_platform_data = { | 97 | static struct musb_hdrc_platform_data musb_platform_data = { |
| 98 | #if defined(CONFIG_USB_MUSB_OTG) | ||
| 99 | .mode = MUSB_OTG, | 98 | .mode = MUSB_OTG, |
| 100 | #elif defined(CONFIG_USB_MUSB_PERIPHERAL) | ||
| 101 | .mode = MUSB_PERIPHERAL, | ||
| 102 | #else /* defined(CONFIG_USB_MUSB_HOST) */ | ||
| 103 | .mode = MUSB_HOST, | ||
| 104 | #endif | ||
| 105 | .config = &musb_hdrc_config, | 99 | .config = &musb_hdrc_config, |
| 106 | .board_data = &musb_board_data, | 100 | .board_data = &musb_board_data, |
| 107 | }; | 101 | }; |