On Mon, Dec 19, 2011 at 08:52:43AM +0100, Philippe Langlais wrote: > From: Philippe Langlais <philippe.langlais@xxxxxxxxxx> > > This change is needed after 622859634 "usb: musb: drop a gigantic amount of ifdeferry", > where CONFIG_USB_MUSB_PERIPHERAL & CONFIG_USB_MUSB_HOST has been removed. > > Signed-off-by: Philippe Langlais <philippe.langlais@xxxxxxxxxx> Acked-by: Felipe Balbi <balbi@xxxxxx> > --- > 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, > }; > -- > 1.7.6 > -- balbi
Attachment:
signature.asc
Description: Digital signature