Skip to content

Commit

Permalink
ARM: mx3/mx35_3ds: rename usb otg platform data variable name
Browse files Browse the repository at this point in the history
Rename the variable holding the usb otg platform data to avoid clash
with usb host platform data variable.

usb_pdata -> usb_otg_pdata

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  • Loading branch information
Marc Kleine-Budde authored and Uwe Kleine-König committed Sep 27, 2010
1 parent 81aa172 commit 79a11b0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-mx3/mach-mx35_3ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static struct pad_desc mx35pdk_pads[] = {
};

/* OTG config */
static struct fsl_usb2_platform_data usb_pdata = {
static struct fsl_usb2_platform_data usb_otg_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI_WIDE,
};
Expand All @@ -124,7 +124,7 @@ static void __init mxc_board_init(void)

imx35_add_imx_uart0(&uart_pdata);

mxc_register_device(&mxc_otg_udc_device, &usb_pdata);
mxc_register_device(&mxc_otg_udc_device, &usb_otg_pdata);

imx35_add_mxc_nand(&mx35pdk_nand_board_info);
}
Expand Down

0 comments on commit 79a11b0

Please sign in to comment.