diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-15 18:55:40 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-15 18:55:50 (GMT) |
| commit | 6960d46a88477c1a8404d225a21331131c5113c2 (patch) | |
| tree | f43f5a1a37ae05bb4c9cd9a6abda3c0f2bc52f84 /arch/arm/mach-imx/common.h | |
| parent | 72533b77d30c2be02672e26b5dde1263d7b4c2be (diff) | |
| parent | 83ae20981ae924c37d02a42c829155fc3851260c (diff) | |
| download | linux-6960d46a88477c1a8404d225a21331131c5113c2.tar.xz | |
Merge tag 'imx-fixes-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo:
It's the second batch of fixes for 3.8, which includes one fixing for
!CONFIG_SMP build, two patches fixing broken imxfb driver caused by
multiplatform conversion, and a couple of pm/hotplug fixes.
* tag 'imx-fixes-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: correct low-power mode setting
ARM: imx: disable cpu in .cpu_kill hook
video: imxfb: fix imxfb_info configuration order
ARM: imx: platform-imx-fb: modifies platform device name
ARM: imx: fix build error with !CONFIG_SMP
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/common.h')
| -rw-r--r-- | arch/arm/mach-imx/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 7191ab4..fa36fb8 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -142,6 +142,7 @@ extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); extern void imx6q_clock_map_io(void); extern void imx_cpu_die(unsigned int cpu); +extern int imx_cpu_kill(unsigned int cpu); #ifdef CONFIG_PM extern void imx6q_pm_init(void); |