projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'depends/rmk/memory_h' into next/cleanup2
[linux-2.6-block.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 272f793e9247128fc49300f0afe40dabdf8b19d4..8da48b33fc532ac015dfcd550c6534652df81efd 100644
(file)
--- a/
arch/arm/mach-imx/mach-imx27ipcam.c
+++ b/
arch/arm/mach-imx/mach-imx27ipcam.c
@@
-71,7
+71,7
@@
static struct sys_timer mx27ipcam_timer = {
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,