selinuxfs: merge dentry allocation into sel_make_dir()

[mv-sheeva.git] / drivers / cpufreq / exynos-cpufreq.c

diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 5467879ea07d9dd60582ffdf44ec88f323c2102e..b243a7ee01f6d51876ca8b8fdc5d6d721ac08bb9 100644 (file)
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -210,6 +210,8 @@ static int exynos_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
        cpufreq_frequency_table_get_attr(exynos_info->freq_table, policy->cpu);
 
+       locking_frequency = exynos_getspeed(0);
+
        /* set the transition latency value */
        policy->cpuinfo.transition_latency = 100000;
 
@@ -252,6 +254,10 @@ static int __init exynos_cpufreq_init(void)
 
        if (soc_is_exynos4210())
                ret = exynos4210_cpufreq_init(exynos_info);
+       else if (soc_is_exynos4212() || soc_is_exynos4412())
+               ret = exynos4x12_cpufreq_init(exynos_info);
+       else if (soc_is_exynos5250())
+               ret = exynos5250_cpufreq_init(exynos_info);
        else
                pr_err("%s: CPU type not found\n", __func__);