Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / plat-mxc / include / mach / mx21.h

diff --git a/arch/arm/plat-mxc/include/mach/mx21.h b/arch/arm/plat-mxc/include/mach/mx21.h
index ed98b9c9f389c622db6c3fc9c41c5730852be1f9..8bc59720b6e4be8ed7b52c08bece17cf35c0cfb1 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx21.h
+++ b/arch/arm/plat-mxc/include/mach/mx21.h
@@ -120,7 +120,7 @@
 #define MX21_INT_GPT1          26
 #define MX21_INT_WDOG          27
 #define MX21_INT_PCMCIA                28
-#define MX21_INT_NANDFC                29
+#define MX21_INT_NFC           29
 #define MX21_INT_BMI           30
 #define MX21_INT_CSI           31
 #define MX21_INT_DMACH0                32