| Message ID | 1382477965-10925-1-git-send-email-troy.kisky@boundarydevices.com |
|---|---|
| State | Accepted |
| Delegated to: | Marek Vasut |
| Headers | show |
On Tue, Oct 22, 2013 at 02:39:25PM -0700, Troy Kisky wrote: > commit bba679144d25b91bcd7befff5a96728a30875f54 > "usb: rename board_usb_init_type to usb_init_type" missed xhci-omap.c > So, fix that patch here, and fix a checkpatch warning. > WARNING: Avoid unnecessary line continuations > > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Applied to u-boot/master, thanks!
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 9458104..bb3a699 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -221,7 +221,7 @@ void usb_hub_reset_devices(int port) * * @return 0 */ -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { int ret; #ifdef CONFIG_PALMAS_USB_SS_PWR diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index f6099ac..e667810 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -27,11 +27,11 @@ DECLARE_GLOBAL_DATA_PTR; static struct omap_xhci omap; -inline int __board_usb_init(int index, enum board_usb_init_type init) +inline int __board_usb_init(int index, enum usb_init_type init) { return 0; } -int board_usb_init(int index, enum board_usb_init_type init) \ +int board_usb_init(int index, enum usb_init_type init) __attribute__((weak, alias("__board_usb_init"))); static void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode)
commit bba679144d25b91bcd7befff5a96728a30875f54 "usb: rename board_usb_init_type to usb_init_type" missed xhci-omap.c So, fix that patch here, and fix a checkpatch warning. WARNING: Avoid unnecessary line continuations Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> --- board/ti/omap5_uevm/evm.c | 2 +- drivers/usb/host/xhci-omap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)