Merge branch 'origin' into devel-stable

[safe/jmp/linux-2.6] / arch / arm / mach-mx2 / devices.h

diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h
index f15df2a..84ed513 100644 (file)
--- a/arch/arm/mach-mx2/devices.h
+++ b/arch/arm/mach-mx2/devices.h
@@ -37,5 +37,6 @@ extern struct platform_device mxc_spi_device1;
 #ifdef CONFIG_MACH_MX27
 extern struct platform_device mxc_spi_device2;
 #endif
+extern struct platform_device mx21_usbhc_device;
 extern struct platform_device imx_ssi_device0;
 extern struct platform_device imx_ssi_device1;