diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/plat-omap/cpu-omap.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/plat-omap/cpu-omap.c')
| -rw-r--r-- | arch/arm/plat-omap/cpu-omap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c index 6d3d33360056..da4f68dbba1d 100644 --- a/arch/arm/plat-omap/cpu-omap.c +++ b/arch/arm/plat-omap/cpu-omap.c | |||
| @@ -40,7 +40,7 @@ static struct clk *mpu_clk; | |||
| 40 | 40 | ||
| 41 | /* TODO: Add support for SDRAM timing changes */ | 41 | /* TODO: Add support for SDRAM timing changes */ |
| 42 | 42 | ||
| 43 | int omap_verify_speed(struct cpufreq_policy *policy) | 43 | static int omap_verify_speed(struct cpufreq_policy *policy) |
| 44 | { | 44 | { |
| 45 | if (freq_table) | 45 | if (freq_table) |
| 46 | return cpufreq_frequency_table_verify(policy, freq_table); | 46 | return cpufreq_frequency_table_verify(policy, freq_table); |
| @@ -58,7 +58,7 @@ int omap_verify_speed(struct cpufreq_policy *policy) | |||
| 58 | return 0; | 58 | return 0; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | unsigned int omap_getspeed(unsigned int cpu) | 61 | static unsigned int omap_getspeed(unsigned int cpu) |
| 62 | { | 62 | { |
| 63 | unsigned long rate; | 63 | unsigned long rate; |
| 64 | 64 | ||
| @@ -101,7 +101,7 @@ static int omap_target(struct cpufreq_policy *policy, | |||
| 101 | return ret; | 101 | return ret; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | static int __init omap_cpu_init(struct cpufreq_policy *policy) | 104 | static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) |
| 105 | { | 105 | { |
| 106 | int result = 0; | 106 | int result = 0; |
| 107 | 107 | ||