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 'for-linus' of git://oss.sgi.com/xfs/xfs
[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_N
ANDFC
29
+#define MX27_INT_N
FC
29
#define MX27_INT_ATA 30
#define MX27_INT_CSI 31
#define MX27_INT_DMACH0 32