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,