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 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
board-g4evm.c
diff --git
a/arch/arm/mach-shmobile/board-g4evm.c
b/arch/arm/mach-shmobile/board-g4evm.c
index
5b3b582
..
c13f012
100644
(file)
--- a/
arch/arm/mach-shmobile/board-g4evm.c
+++ b/
arch/arm/mach-shmobile/board-g4evm.c
@@
-394,6
+394,7
@@
static struct sys_timer g4evm_timer = {
MACHINE_START(G4EVM, "g4evm")
.map_io = g4evm_map_io,
.init_irq = sh7377_init_irq,
MACHINE_START(G4EVM, "g4evm")
.map_io = g4evm_map_io,
.init_irq = sh7377_init_irq,
+ .handle_irq = shmobile_handle_irq_intc,
.init_machine = g4evm_init,
.timer = &g4evm_timer,
MACHINE_END
.init_machine = g4evm_init,
.timer = &g4evm_timer,
MACHINE_END