Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / cpufreq / dbx500-cpufreq.c

diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 9a623753dee234348bcdc5723eb9468adcecd4b5..72f0c3efa76e6b7d89114c463ccd7c5243ccb917 100644 (file)
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <mach/id.h>
 
 static struct cpufreq_frequency_table *freq_table;
 static struct clk *armss_clk;
@@ -117,9 +116,7 @@ static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
        policy->cpuinfo.transition_latency = 20 * 1000; /* in ns */
 
        /* policy sharing between dual CPUs */
-       cpumask_copy(policy->cpus, cpu_present_mask);
-
-       policy->shared_type = CPUFREQ_SHARED_TYPE_ALL;
+       cpumask_setall(policy->cpus);
 
        return 0;
 }
@@ -169,9 +166,6 @@ static struct platform_driver dbx500_cpufreq_plat_driver = {
 
 static int __init dbx500_cpufreq_register(void)
 {
-       if (!cpu_is_u8500_family())
-               return -ENODEV;
-
        return platform_driver_register(&dbx500_cpufreq_plat_driver);
 }
 device_initcall(dbx500_cpufreq_register);