summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2013-10-22 14:27:17 -0700
committerTom Rini <trini@ti.com>2013-10-22 17:33:09 -0400
commit7e575c46c34b5f1316eab39025fdced197629ccb (patch)
treece3b2df05662b071118fce74af4ce5305fd5e4f5
parent717ceb63a58e1c0047bbdce304c677054bdfb281 (diff)
downloadu-boot-imx-7e575c46c34b5f1316eab39025fdced197629ccb.zip
u-boot-imx-7e575c46c34b5f1316eab39025fdced197629ccb.tar.gz
u-boot-imx-7e575c46c34b5f1316eab39025fdced197629ccb.tar.bz2
usb: rename board_usb_init_type to usb_init_type
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>
-rw-r--r--board/ti/omap5_uevm/evm.c2
-rw-r--r--drivers/usb/host/xhci-omap.c4
2 files changed, 3 insertions, 3 deletions
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)