From b2a4a51e71af81a4b864aa91855411c5bfa014d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Fri, 18 Jun 2010 16:19:55 +0200 Subject: [PATCH] --- yaml --- r: 201575 b: refs/heads/master c: cbb052c905367e20c11f3b107cfe07e36dd6c8cd h: refs/heads/master i: 201573: 6335060ca09812d097fc62ed411c401bc792e8a9 201571: 5d9d24bc9e672c5198a68bc66900c4fc5ccd1421 201567: e75ce4a25a0b70e61331e58e1f06d00559b53d50 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx2/mach-cpuimx27.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8961d614dd4b..0f929c73aeb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68ef866170dc92fb29e96e85fb6f438839500681 +refs/heads/master: cbb052c905367e20c11f3b107cfe07e36dd6c8cd diff --git a/trunk/arch/arm/mach-mx2/mach-cpuimx27.c b/trunk/arch/arm/mach-mx2/mach-cpuimx27.c index dc2dca3ff9b7..55291787d5d1 100644 --- a/trunk/arch/arm/mach-mx2/mach-cpuimx27.c +++ b/trunk/arch/arm/mach-mx2/mach-cpuimx27.c @@ -219,6 +219,7 @@ static struct platform_device serial_device = { }; #endif +#if defined(CONFIG_USB_ULPI) static struct mxc_usbh_platform_data otg_pdata = { .portsc = MXC_EHCI_MODE_ULPI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI, @@ -228,6 +229,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { .portsc = MXC_EHCI_MODE_ULPI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI, }; +#endif static struct fsl_usb2_platform_data otg_device_pdata = { .operating_mode = FSL_USB2_DR_DEVICE,