Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[pandora-kernel.git] / arch / arm / plat-mxc / include / mach / mx27.h

diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h
index a8ab2e0..2237ba2 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx27.h
+++ b/arch/arm/plat-mxc/include/mach/mx27.h
@@ -167,7 +167,7 @@ static inline void mx27_setup_weimcs(size_t cs,
 #define MX27_INT_GPT1          26
 #define MX27_INT_WDOG          27
 #define MX27_INT_PCMCIA                28
-#define MX27_INT_NANDFC                29
+#define MX27_INT_NFC           29
 #define MX27_INT_ATA           30
 #define MX27_INT_CSI           31
 #define MX27_INT_DMACH0                32