git.samba.org
/
sfrench
/
cifs-2.6.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/viro/vfs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s5p6442
/
include
/
mach
/
irqs.h
diff --git
a/arch/arm/mach-s5p6442/include/mach/irqs.h
b/arch/arm/mach-s5p6442/include/mach/irqs.h
index 02c23749c0230414659e0e2825fa7d9f209dea50..3fbc6c3ad2dab607246bcccc3ab269ada608a728 100644
(file)
--- a/
arch/arm/mach-s5p6442/include/mach/irqs.h
+++ b/
arch/arm/mach-s5p6442/include/mach/irqs.h
@@
-32,7
+32,7
@@
#define IRQ_GPIOINT S5P_IRQ_VIC0(30)
/* VIC1 */
-#define IRQ_
nPMUIRQ
S5P_IRQ_VIC1(0)
+#define IRQ_
PMU
S5P_IRQ_VIC1(0)
#define IRQ_ONENAND S5P_IRQ_VIC1(7)
#define IRQ_UART0 S5P_IRQ_VIC1(10)
#define IRQ_UART1 S5P_IRQ_VIC1(11)