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 'imx/devel' into next/dt
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-imx27ipcam.c
diff --git
a/arch/arm/mach-imx/mach-imx27ipcam.c
b/arch/arm/mach-imx/mach-imx27ipcam.c
index
272f793
..
7052155
100644
(file)
--- a/
arch/arm/mach-imx/mach-imx27ipcam.c
+++ b/
arch/arm/mach-imx/mach-imx27ipcam.c
@@
-71,10
+71,11
@@
static struct sys_timer mx27ipcam_timer = {
MACHINE_START(IMX27IPCAM, "Freescale IMX27IPCAM")
/* maintainer: Freescale Semiconductor, Inc. */
MACHINE_START(IMX27IPCAM, "Freescale IMX27IPCAM")
/* maintainer: Freescale Semiconductor, Inc. */
- .
boot_params = MX27_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx27_map_io,
.init_early = imx27_init_early,
.init_irq = mx27_init_irq,
.map_io = mx27_map_io,
.init_early = imx27_init_early,
.init_irq = mx27_init_irq,
+ .handle_irq = imx27_handle_irq,
.timer = &mx27ipcam_timer,
.init_machine = mx27ipcam_init,
MACHINE_END
.timer = &mx27ipcam_timer,
.init_machine = mx27ipcam_init,
MACHINE_END