From: Simon Horman <horms+renesas@verge.net.au>
Date: Thu, 19 Mar 2015 02:02:53 +0000 (+0900)
Subject: Merge branch 'heads/soc-cleanup-for-v4.1' into next
X-Git-Tag: KARO-TXA5-2015-06-26~142^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=53a6e52502915f364c87d282b66402f2c333b083;p=karo-tx-linux.git

Merge branch 'heads/soc-cleanup-for-v4.1' into next

Conflicts:
	arch/arm/mach-shmobile/pm-sh7372.c
---

53a6e52502915f364c87d282b66402f2c333b083
diff --cc arch/arm/mach-shmobile/common.h
index 8faf6e040d78,1dc09713f753..afc60bad6fd6
--- a/arch/arm/mach-shmobile/common.h
+++ b/arch/arm/mach-shmobile/common.h
@@@ -21,9 -21,8 +21,7 @@@ extern void shmobile_smp_scu_cpu_die(un
  extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);
  struct clk;
  extern int shmobile_clk_init(void);
 -extern void shmobile_handle_irq_intc(struct pt_regs *);
  extern struct platform_suspend_ops shmobile_suspend_ops;
- struct cpuidle_driver;
- extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
  
  #ifdef CONFIG_SUSPEND
  int shmobile_suspend_init(void);