Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[linux-2.6] / include / asm-arm / arch-mxc / hardware.h

diff --git a/include/asm-arm/arch-mxc/hardware.h b/include/asm-arm/arch-mxc/hardware.h
index 4ed2d8072d039a5e81e8fbdc5825d88a49b90362..37cddbaaade7de5763cefe51b878d4d724961968 100644 (file)
--- a/include/asm-arm/arch-mxc/hardware.h
+++ b/include/asm-arm/arch-mxc/hardware.h
@@ -26,6 +26,12 @@
 # include <asm/arch/mx31.h>
 #endif
 
+#ifdef CONFIG_ARCH_MX2
+# ifdef CONFIG_MACH_MX27
+#  include <asm/arch/mx27.h>
+# endif
+#endif
+
 #include <asm/arch/mxc.h>
 
 #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */