From: Kukjin Kim <kgene.kim@samsung.com>
Date: Wed, 13 Feb 2013 01:14:06 +0000 (-0800)
Subject: Merge branch 'next/cpufreq-exynos' into for-next
X-Git-Tag: next-20130218~13^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=786b27035d1348bdefbdd658a8ea6d0a2126e799;p=karo-tx-linux.git

Merge branch 'next/cpufreq-exynos' into for-next
---

786b27035d1348bdefbdd658a8ea6d0a2126e799
diff --cc drivers/cpufreq/exynos4210-cpufreq.c
index a5d0a8184220,de91755e2556..add7fbec4fc9
--- a/drivers/cpufreq/exynos4210-cpufreq.c
+++ b/drivers/cpufreq/exynos4210-cpufreq.c
@@@ -18,14 -18,8 +18,9 @@@
  #include <linux/cpufreq.h>
  
  #include <mach/regs-clock.h>
 -#include <mach/cpufreq.h>
 +
 +#include "exynos-cpufreq.h"
  
- #define CPUFREQ_LEVEL_END	L5
- 
- static int max_support_idx = L0;
- static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
- 
  static struct clk *cpu_clk;
  static struct clk *moutcore;
  static struct clk *mout_mpll;
diff --cc drivers/cpufreq/exynos4x12-cpufreq.c
index 63ff74eec521,0661039e5d4a..08b7477b0aa2
--- a/drivers/cpufreq/exynos4x12-cpufreq.c
+++ b/drivers/cpufreq/exynos4x12-cpufreq.c
@@@ -18,14 -18,8 +18,9 @@@
  #include <linux/cpufreq.h>
  
  #include <mach/regs-clock.h>
 -#include <mach/cpufreq.h>
 +
 +#include "exynos-cpufreq.h"
  
- #define CPUFREQ_LEVEL_END	(L13 + 1)
- 
- static int max_support_idx;
- static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
- 
  static struct clk *cpu_clk;
  static struct clk *moutcore;
  static struct clk *mout_mpll;
diff --cc drivers/cpufreq/exynos5250-cpufreq.c
index 407126c2d7c6,b9344869f822..9fae466d7746
--- a/drivers/cpufreq/exynos5250-cpufreq.c
+++ b/drivers/cpufreq/exynos5250-cpufreq.c
@@@ -19,13 -19,8 +19,9 @@@
  
  #include <mach/map.h>
  #include <mach/regs-clock.h>
 -#include <mach/cpufreq.h>
 +
 +#include "exynos-cpufreq.h"
  
- #define CPUFREQ_LEVEL_END	(L15 + 1)
- 
- static int max_support_idx;
- static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
  static struct clk *cpu_clk;
  static struct clk *moutcore;
  static struct clk *mout_mpll;