From 13e3925bc6d08d6df960a88e1853c4ccb09eab29 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 18 Aug 2010 17:56:44 +0200 Subject: [PATCH] --- yaml --- r: 212495 b: refs/heads/master c: 79a11b0ba4a4e2f042b143e6ac0813d6fab90626 h: refs/heads/master i: 212493: d81857b229ba9cd4956c82875c1d4fa6e8dc9936 212491: 500beb66c9d70b8a4c8c4099a3a95171867d228e 212487: 458be74e12d50e467e7d210c2c1e9e9f5f3818c5 212479: 493f017ed3e1b0029d32a37dbad4046f8e6ee297 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/mach-mx35_3ds.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb3deac0129e..8330e4091a77 100644 --- 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 index b3629e735606..ae0f17cc8d73 100644 --- 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); }