diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 01:56:41 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 01:56:41 -0500 |
| commit | 469da62096e23adc755c1268b00b5fc7a214151b (patch) | |
| tree | fefd055fdae584e38d551f44d1339eb22cee4ed9 /arch/arm/mach-imx/platsmp.c | |
| parent | 4227961650884a06757f80877d5dce0bddc723d4 (diff) | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
Merge tag 'v3.8-rc6' into next/soc
Linux 3.8-rc6
Diffstat (limited to 'arch/arm/mach-imx/platsmp.c')
| -rw-r--r-- | arch/arm/mach-imx/platsmp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/platsmp.c b/arch/arm/mach-imx/platsmp.c index 0f7e6db1e328..7c0b03f67b05 100644 --- a/arch/arm/mach-imx/platsmp.c +++ b/arch/arm/mach-imx/platsmp.c | |||
| @@ -100,5 +100,6 @@ struct smp_operations imx_smp_ops __initdata = { | |||
| 100 | .smp_boot_secondary = imx_boot_secondary, | 100 | .smp_boot_secondary = imx_boot_secondary, |
| 101 | #ifdef CONFIG_HOTPLUG_CPU | 101 | #ifdef CONFIG_HOTPLUG_CPU |
| 102 | .cpu_die = imx_cpu_die, | 102 | .cpu_die = imx_cpu_die, |
| 103 | .cpu_kill = imx_cpu_kill, | ||
| 103 | #endif | 104 | #endif |
| 104 | }; | 105 | }; |