diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-imx/mach-kzm_arm11_01.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-imx/mach-kzm_arm11_01.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-kzm_arm11_01.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c index e472a1d88058..7c20e9e58006 100644 --- a/arch/arm/mach-imx/mach-kzm_arm11_01.c +++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c | |||
| @@ -271,7 +271,7 @@ static struct sys_timer kzm_timer = { | |||
| 271 | }; | 271 | }; |
| 272 | 272 | ||
| 273 | MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01") | 273 | MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01") |
| 274 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 274 | .atag_offset = 0x100, |
| 275 | .map_io = kzm_map_io, | 275 | .map_io = kzm_map_io, |
| 276 | .init_early = imx31_init_early, | 276 | .init_early = imx31_init_early, |
| 277 | .init_irq = mx31_init_irq, | 277 | .init_irq = mx31_init_irq, |