On Mon, Jul 18, 2011 at 06:51:11PM +0530, Rabin Vincent wrote: > After 622859634 (usb: musb: drop a gigantic amount of ifdeferry): > > - USB_GADGET_MUSB_HDRC is no longer selectable because it > depends on the removed USB_MUSB_PERIPHERAL and USB_MUSB_OTG > options > > - The Kconfig comment still says "Enable Host or Gadget support > to see Inventra options", even though you now need to enable > both of them to see Inventra options. > > Fix these. > > Signed-off-by: Rabin Vincent <rabin@xxxxxx> > --- > drivers/usb/gadget/Kconfig | 2 +- > drivers/usb/musb/Kconfig | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index 44b6b40..5a084b9 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -310,7 +310,7 @@ config USB_PXA_U2O > # musb builds in ../musb along with host support > config USB_GADGET_MUSB_HDRC > tristate "Inventra HDRC USB Peripheral (TI, ADI, ...)" > - depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG) > + depends on USB_MUSB_HDRC > select USB_GADGET_DUALSPEED > help > This OTG-capable silicon IP is used in dual designs including > diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig > index 6192b45..2b1846d 100644 > --- a/drivers/usb/musb/Kconfig > +++ b/drivers/usb/musb/Kconfig > @@ -3,8 +3,8 @@ > # for silicon based on Mentor Graphics INVENTRA designs > # > > -comment "Enable Host or Gadget support to see Inventra options" > - depends on !USB && USB_GADGET=n > +comment "Enable Host and Gadget support to see Inventra options" > + depends on !USB || USB_GADGET=n you might as well remove this comment now that we're always compiling with both Host and Peripheral sides enabled. -- balbi
Attachment:
signature.asc
Description: Digital signature
