Merge tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...

From Kukjin Kim:
samsung cleanup for v3.12
- cleanup non-dt stuff in exynos
- remove 0x from exynos dt files
- remove unused codes

* tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
  ARM: dts: Remove '0x's from Exynos5440 DTS file
  ARM: dts: Remove '0x's from Exynos5420 DTS file
  ARM: dts: Remove '0x's from Exynos5250 DTS file
  ARM: dts: Remove '0x's from Exynos4x12 DTSI file
  ARM: dts: Remove '0x's from Exynos4210 DTSI file
  ARM: EXYNOS: Cleanup common.h file
  irqchip: exynos: cleanup non-DT stuff in exynos-combiner

Signed-off-by: Kevin Hilman <khilman@linaro.org>

diff --combined arch/arm/mach-exynos/common.h
index 972490fc09d627241a1d3c63e7d234693b4f03d8,7318e62ce5b44702f66fdddca05b27effa4947eb..8646a141ae467b8175aed00d0acf39ae73f02097
--- 1/arch/arm/mach-exynos/common.h
--- 2/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@@ -17,7 -17,6 +17,6 @@@
  
  void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1);
  void exynos_init_time(void);
- extern unsigned long xxti_f, xusbxti_f;
  
  struct map_desc;
  void exynos_init_io(void);
@@@ -25,56 -24,14 +24,14 @@@ void exynos4_restart(enum reboot_mode m
  void exynos5_restart(enum reboot_mode mode, const char *cmd);
  void exynos_init_late(void);
  
- /* ToDo: remove these after migrating legacy exynos4 platforms to dt */
- void exynos4_clk_init(struct device_node *np, int is_exynos4210, void __iomem *reg_base, unsigned long xom);
- void exynos4_clk_register_fixed_ext(unsigned long, unsigned long);
- 
  void exynos_firmware_init(void);
  
- void exynos_set_timer_source(u8 channels);
- 
  #ifdef CONFIG_PM_GENERIC_DOMAINS
  int exynos_pm_late_initcall(void);
  #else
  static inline int exynos_pm_late_initcall(void) { return 0; }
  #endif
  
- #ifdef CONFIG_ARCH_EXYNOS4
- void exynos4_register_clocks(void);
- void exynos4_setup_clocks(void);
- 
- #else
- #define exynos4_register_clocks()
- #define exynos4_setup_clocks()
- #endif
- 
- #ifdef CONFIG_ARCH_EXYNOS5
- void exynos5_register_clocks(void);
- void exynos5_setup_clocks(void);
- 
- #else
- #define exynos5_register_clocks()
- #define exynos5_setup_clocks()
- #endif
- 
- #ifdef CONFIG_CPU_EXYNOS4210
- void exynos4210_register_clocks(void);
- 
- #else
- #define exynos4210_register_clocks()
- #endif
- 
- #ifdef CONFIG_SOC_EXYNOS4212
- void exynos4212_register_clocks(void);
- 
- #else
- #define exynos4212_register_clocks()
- #endif
- 
- struct device_node;
- void combiner_init(void __iomem *combiner_base, struct device_node *np,
-                       unsigned int max_nr, int irq_base);
- 
  extern struct smp_operations exynos_smp_ops;
  
  extern void exynos_cpu_die(unsigned int cpu);
@@@ -97,5 -54,6 +54,5 @@@ struct exynos_pmu_conf 
  };
  
  extern void exynos_sys_powerdown_conf(enum sys_powerdown mode);
 -extern void s3c_cpu_resume(void);
  
  #endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */