diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:28 -0400 |
| commit | 7e0cac630c7c90f12a78131df9913657fa30243b (patch) | |
| tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/mach-imx/mach-pcm038.c | |
| parent | 94314a40bcc537c396012e37cf887572f0d82aef (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
Merge branch 'imx/devel' into imx/imx6q
Conflicts:
arch/arm/plat-mxc/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm038.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 091bcf87e1a0..f0a5282aa011 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
| @@ -353,6 +353,7 @@ MACHINE_START(PCM038, "phyCORE-i.MX27") | |||
| 353 | .map_io = mx27_map_io, | 353 | .map_io = mx27_map_io, |
| 354 | .init_early = imx27_init_early, | 354 | .init_early = imx27_init_early, |
| 355 | .init_irq = mx27_init_irq, | 355 | .init_irq = mx27_init_irq, |
| 356 | .handle_irq = imx27_handle_irq, | ||
| 356 | .timer = &pcm038_timer, | 357 | .timer = &pcm038_timer, |
| 357 | .init_machine = pcm038_init, | 358 | .init_machine = pcm038_init, |
| 358 | MACHINE_END | 359 | MACHINE_END |