From: Shawn Guo <shawn.guo@linaro.org>
Date: Fri, 12 Apr 2013 11:00:28 +0000 (+0800)
Subject: Merge tag 'imx-cleanup-3.10' into imx/soc
X-Git-Tag: v3.12-rc1~872^2~2^2~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a862d88d3f119efcb50aa3b8644643d6c97e3250;p=kernel%2Fkernel-generic.git

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

The imx cleanup for 3.10:

* Clean up a couple of unneeded function declarations
* Remove imx specific cpufreq driver as generic cpufreq-cpu0 works well
  as the replacement
* Remove platform ahci support
* Clean up unused ARCH/MACH Kconfig symbols
* Remove a couple of unused files
---

a862d88d3f119efcb50aa3b8644643d6c97e3250
diff --cc arch/arm/mach-imx/common.h
index 5bf4a97,d4b2f36..9fea252
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@@ -110,10 -110,7 +110,9 @@@ void tzic_handle_irq(struct pt_regs *)
  
  extern void imx_enable_cpu(int cpu, bool enable);
  extern void imx_set_cpu_jump(int cpu, void *jump_addr);
 +extern u32 imx_get_cpu_arg(int cpu);
 +extern void imx_set_cpu_arg(int cpu, u32 arg);
  extern void v7_cpu_resume(void);
- extern u32 *pl310_get_save_ptr(void);
  #ifdef CONFIG_SMP
  extern void v7_secondary_startup(void);
  extern void imx_scu_map_io(void);