git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.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
ed98b9c
..
8bc5972
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_N
ANDFC
29
+#define MX21_INT_N
FC
29
#define MX21_INT_BMI 30
#define MX21_INT_CSI 31
#define MX21_INT_DMACH0 32