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 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
gic.h
diff --git
a/arch/mips/include/asm/gic.h
b/arch/mips/include/asm/gic.h
index
10292e3
..
a8f5734
100644
(file)
--- a/
arch/mips/include/asm/gic.h
+++ b/
arch/mips/include/asm/gic.h
@@
-20,7
+20,7
@@
#define GIC_TRIG_EDGE 1
#define GIC_TRIG_LEVEL 0
-#if CONFIG_SMP
+#if
def
CONFIG_SMP
#define GIC_NUM_INTRS (24 + NR_CPUS * 2)
#else
#define GIC_NUM_INTRS 32