---

yaml --- r: 212495 b: refs/heads/master c: 79a11b0 h: refs/heads/master i: 212493: d81857b 212491: 500beb6 212487: 458be74 212479: 493f017 v: v3
git-mirror · Sep 27, 2010 · 13e3925 · 13e3925
1 parent 2ef3339
commit 13e3925
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81aa17207b3c50f32be31a1be949e98c660da5f1
+refs/heads/master: 79a11b0ba4a4e2f042b143e6ac0813d6fab90626
diff --git a/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c b/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c
@@ -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,
 };
@@ -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);
 }