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-mx2/mach-pcm038.c | |
| parent | 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c (diff) | |
| parent | e27bf72465f4d867a2aea33cad5e9e255c4d92ff (diff) | |
| download | talos-op-linux-9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60.tar.gz talos-op-linux-9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60.zip | |
Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/mach-mx2/mach-pcm038.c')
| -rw-r--r-- | arch/arm/mach-mx2/mach-pcm038.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/mach-pcm038.c b/arch/arm/mach-mx2/mach-pcm038.c index 9636bb82f1e9..e055d9dd6101 100644 --- a/arch/arm/mach-mx2/mach-pcm038.c +++ b/arch/arm/mach-mx2/mach-pcm038.c @@ -328,7 +328,7 @@ static struct sys_timer pcm038_timer = { MACHINE_START(PCM038, "phyCORE-i.MX27") .phys_io = MX27_AIPI_BASE_ADDR, .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, - .boot_params = PHYS_OFFSET + 0x100, + .boot_params = MX27_PHYS_OFFSET + 0x100, .map_io = mx27_map_io, .init_irq = mx27_init_irq, .init_machine = pcm038_init, |
