diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:26:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:26:52 -0400 |
| commit | 47258cf3c4aa5d56e678bafe0dd0d03ddd980b88 (patch) | |
| tree | 4856f0fb1185ba97f320a7ed6fb63bf136708a42 /arch/arm/mach-s3c2440/mach-nexcoder.c | |
| parent | c308b56b5398779cd3da0f62ab26b0453494c3d4 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
Merge tag 'v3.3-rc7' into sched/core
Merge reason: merge back final fixes, prepare for the merge window.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-nexcoder.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-nexcoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index 40eaf844bc1f..5198e3e1c5be 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c | |||
| @@ -158,5 +158,5 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") | |||
| 158 | .init_machine = nexcoder_init, | 158 | .init_machine = nexcoder_init, |
| 159 | .init_irq = s3c24xx_init_irq, | 159 | .init_irq = s3c24xx_init_irq, |
| 160 | .timer = &s3c24xx_timer, | 160 | .timer = &s3c24xx_timer, |
| 161 | .restart = s3c2440_restart, | 161 | .restart = s3c244x_restart, |
| 162 | MACHINE_END | 162 | MACHINE_END |