On Thu, Aug 29, 2019 at 02:08:05PM +0200, Marek Vasut wrote: > The following changes since commit 8c56ea5c1e033f16993e5427300399ef848234bb: > > Merge branch 'u-boot-stm32_20190827' of > https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-08-27 13:19:47 > -0400) > > are available in the Git repository at: > > git://git.denx.de/u-boot-usb.git master > > for you to fetch changes up to fd0637b814cdbc8aa9060f313f6c8e71fb9c5d15: > > dwc2: use the nonblock argument in submit_int_msg (2019-08-29 14:07:26 > +0200) >
NAK, this breaks nokia_rx51 and am3517_crane: +(nokia_rx51,am3517_crane) ../drivers/usb/musb/musb_hcd.c:1052:5: error: conflicting types for 'submit_int_msg' +(nokia_rx51,am3517_crane) int submit_int_msg(struct usb_device *dev, unsigned long pipe, +(nokia_rx51,am3517_crane) ^~~~~~~~~~~~~~ +(nokia_rx51,am3517_crane) In file included from ../drivers/usb/musb/musb_hcd.c:11:0: +(nokia_rx51,am3517_crane) ../include/usb.h:186:5: note: previous declaration of 'submit_int_msg' was here +(nokia_rx51,am3517_crane) int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, +(nokia_rx51,am3517_crane) make[2]: *** [../scripts/Makefile.build:279: drivers/usb/musb/musb_hcd.o] Error 1 +(nokia_rx51,am3517_crane) make[1]: *** [Makefile:1598: drivers/usb/musb] Error 2 +(nokia_rx51,am3517_crane) make: *** [Makefile:148: sub-make] Error 2 -- Tom
signature.asc
Description: PGP signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot