From 3a67030268814c91259842bcfff683df8c34fc88 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 13 Aug 2009 10:02:30 +0200
Subject: [PATCH] --- yaml --- r: 160900 b: refs/heads/master c:
 f6d2fa7dcbd438da4d150f695ebd219419a325ce h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-mx2/devices.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8ac553b0af0..5e5b3b8dfb6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2718c15c5fffa9d05e5076451ab4fc81caac313f
+refs/heads/master: f6d2fa7dcbd438da4d150f695ebd219419a325ce
diff --git a/trunk/arch/arm/mach-mx2/devices.c b/trunk/arch/arm/mach-mx2/devices.c
index 62810cbe4e30..50199aff0143 100644
--- a/trunk/arch/arm/mach-mx2/devices.c
+++ b/trunk/arch/arm/mach-mx2/devices.c
@@ -437,6 +437,7 @@ struct platform_device mxc_sdhc_device1 = {
        .resource       = mxc_sdhc2_resources,
 };
 
+#ifdef CONFIG_MACH_MX27
 static struct resource otg_resources[] = {
 	{
 		.start	= OTG_BASE_ADDR,
@@ -527,7 +528,7 @@ struct platform_device mxc_usbh2 = {
 	.resource = mxc_usbh2_resources,
 	.num_resources = ARRAY_SIZE(mxc_usbh2_resources),
 };
-
+#endif
 
 /* GPIO port description */
 static struct mxc_gpio_port imx_gpio_ports[] = {