diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-14 23:12:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-14 23:12:08 +0100 |
| commit | 51c4c4ce1df49b14bbfc334c6388cc9efe32c631 (patch) | |
| tree | b33a9a905b9b646c78be7df7c189e7f9c0f28f77 /drivers/cpufreq/s3c2440-cpufreq.c | |
| parent | 6cbd7ee10e2842a3d1f9b60abede1c8f3d1f1130 (diff) | |
| parent | 22c73795b101597051924556dce019385a1e2fa0 (diff) | |
| download | op-kernel-dev-51c4c4ce1df49b14bbfc334c6388cc9efe32c631.zip op-kernel-dev-51c4c4ce1df49b14bbfc334c6388cc9efe32c631.tar.gz | |
Merge back earlier 'pm-cpufreq' material.
Diffstat (limited to 'drivers/cpufreq/s3c2440-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/s3c2440-cpufreq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cpufreq/s3c2440-cpufreq.c b/drivers/cpufreq/s3c2440-cpufreq.c index 72b2cc8..f84ed10 100644 --- a/drivers/cpufreq/s3c2440-cpufreq.c +++ b/drivers/cpufreq/s3c2440-cpufreq.c @@ -22,8 +22,6 @@ #include <linux/err.h> #include <linux/io.h> -#include <mach/hardware.h> - #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -55,7 +53,7 @@ static inline int within_khz(unsigned long a, unsigned long b) * specified in @cfg. The values are stored in @cfg for later use * by the relevant set routine if the request settings can be reached. */ -int s3c2440_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg) +static int s3c2440_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg) { unsigned int hdiv, pdiv; unsigned long hclk, fclk, armclk; @@ -242,7 +240,7 @@ static int s3c2440_cpufreq_calctable(struct s3c_cpufreq_config *cfg, return ret; } -struct s3c_cpufreq_info s3c2440_cpufreq_info = { +static struct s3c_cpufreq_info s3c2440_cpufreq_info = { .max = { .fclk = 400000000, .hclk = 133333333, |
