diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-04 11:18:09 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-04 11:18:09 +0100 |
commit | 9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60 (patch) | |
tree | b0f46e9a9164f75efb59ca241ca16b6ce03be0b6 /arch/arm/mach-mx3/mach-kzm_arm11_01.c | |
parent | 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c (diff) | |
parent | e27bf72465f4d867a2aea33cad5e9e255c4d92ff (diff) |
Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/mach-mx3/mach-kzm_arm11_01.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-kzm_arm11_01.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c index 2484dddca54..f085d5d1a6d 100644 --- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c +++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c @@ -265,7 +265,7 @@ static struct sys_timer kzm_timer = { MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01") .phys_io = MX31_AIPS1_BASE_ADDR, .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX3x_PHYS_OFFSET + 0x100, .map_io = kzm_map_io, .init_irq = mx31_init_irq, .init_machine = kzm_board_init, |