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/mason/btrfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
viper.c
diff --git
a/arch/arm/mach-pxa/viper.c
b/arch/arm/mach-pxa/viper.c
index
903218e
..
d4a3dc7
100644
(file)
--- a/
arch/arm/mach-pxa/viper.c
+++ b/
arch/arm/mach-pxa/viper.c
@@
-995,6
+995,7
@@
MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC")
.boot_params = 0xa0000100,
.map_io = viper_map_io,
.init_irq = viper_init_irq,
.boot_params = 0xa0000100,
.map_io = viper_map_io,
.init_irq = viper_init_irq,
+ .handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = viper_init,
MACHINE_END
.timer = &pxa_timer,
.init_machine = viper_init,
MACHINE_END