Hi, On Tue, Jul 17, 2012 at 11:34:52AM +0200, Marc Kleine-Budde wrote: > On 07/17/2012 11:15 AM, Felipe Balbi wrote: > > On Mon, Jul 16, 2012 at 10:18:20PM +0200, Marc Kleine-Budde wrote: > >> Since commit "5e0aa49 usb: chipidea: use generic map/unmap routines", > >> the udc part of the chipidea driver needs the generic usb gadget helper > >> functions. If the chipidea driver with udc support is built into the > >> kernel and usb gadget is built a module, the linking of the kernel > >> fails with: > >> > >> drivers/built-in.o: In function `_hardware_dequeue': > >> drivers/usb/chipidea/udc.c:527: > >> undefined reference to `usb_gadget_unmap_request' > >> drivers/usb/chipidea/udc.c:1269: > >> undefined reference to `usb_gadget_unmap_request' > >> drivers/usb/chipidea/udc.c:1821: > >> undefined reference to `usb_del_gadget_udc' > >> drivers/usb/chipidea/udc.c:443: > >> undefined reference to `usb_gadget_map_request' > >> drivers/usb/chipidea/udc.c:1774: > >> undefined reference to `usb_add_gadget_udc' > >> > >> This patch changes the dependencies, so that udc support can only be > >> activated if the linux gadget support (USB_GADGET) is builtin or both > >> chipidea driver and USB_GADGET are modular. Same dependencies for the > >> chipidea host support and the linux host side USB support (USB). > >> > >> While there, fix the indention of chipidea the help text. > >> > >> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> > >> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > > > > this looks like it tackles everything. didn't test myself but still: > > > > Reviewed-by: Felipe Balbi <balbi@xxxxxx> > > Thanks. Is this for v3.5 or should I rebase to Greg's usb-tree? That's up to Alex and Greg. My suggestion is that this can wait for v3.6-rc cycle with a backport to stable. Greg and Alex have the final saying. -- balbi
Attachment:
signature.asc
Description: Digital signature