From: Shawn Guo <shawn.guo@linaro.org>
Date: Tue, 5 Feb 2013 02:14:40 +0000 (+0800)
Subject: Merge tag 'imx-cleanup-3.9' into imx/soc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f662f52a91742f2aec738492eab87b937216d89f;p=linux.git

Merge tag 'imx-cleanup-3.9' into imx/soc
---

f662f52a91742f2aec738492eab87b937216d89f
diff --cc arch/arm/mach-imx/common.h
index fa36fb84ab193,972c9f8cc97a9..1ef0a26bf1618
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@@ -139,10 -129,8 +129,9 @@@ extern void imx_gpc_init(void)
  extern void imx_gpc_pre_suspend(void);
  extern void imx_gpc_post_resume(void);
  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);