projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
mach-mx1ads.c
diff --git
a/arch/arm/mach-imx/mach-mx1ads.c
b/arch/arm/mach-imx/mach-mx1ads.c
index
b4a5e03
..
fc49785
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx1ads.c
+++ b/
arch/arm/mach-imx/mach-mx1ads.c
@@
-144,6
+144,7
@@
MACHINE_START(MX1ADS, "Freescale MX1ADS")
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
+ .handle_irq = imx1_handle_irq,
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END
@@
-153,6
+154,7
@@
MACHINE_START(MXLADS, "Freescale MXLADS")
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
+ .handle_irq = imx1_handle_irq,
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END