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://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
plat-s5p
/
include
/
plat
/
irqs.h
diff --git
a/arch/arm/plat-s5p/include/plat/irqs.h
b/arch/arm/plat-s5p/include/plat/irqs.h
index
42e757f
..
9ff3d71
100644
(file)
--- a/
arch/arm/plat-s5p/include/plat/irqs.h
+++ b/
arch/arm/plat-s5p/include/plat/irqs.h
@@
-79,7
+79,7
@@
#define S5P_IRQ_VIC2(x) (S5P_VIC2_BASE + (x))
#define S5P_IRQ_VIC3(x) (S5P_VIC3_BASE + (x))
-#define S5P_TIMER_IRQ(x)
S5P_IRQ
(11 + (x))
+#define S5P_TIMER_IRQ(x) (11 + (x))
#define IRQ_TIMER0 S5P_TIMER_IRQ(0)
#define IRQ_TIMER1 S5P_TIMER_IRQ(1)