Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / drivers / cpufreq / s3c2412-cpufreq.c

diff --git a/drivers/cpufreq/s3c2412-cpufreq.c b/drivers/cpufreq/s3c2412-cpufreq.c
index 4645b4898996bc38df1dff6a23a4f9d12176fa8c..eb262133fef25e31b261edeaf19725a34746759d 100644 (file)
--- a/drivers/cpufreq/s3c2412-cpufreq.c
+++ b/drivers/cpufreq/s3c2412-cpufreq.c
@@ -28,7 +28,6 @@
 #include <mach/s3c2412.h>
 
 #include <plat/cpu.h>
-#include <plat/clock.h>
 #include <plat/cpu-freq-core.h>
 
 /* our clock resources. */
@@ -188,8 +187,6 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = {
        .set_iotiming   = s3c2412_iotiming_set,
        .get_iotiming   = s3c2412_iotiming_get,
 
-       .resume_clocks  = s3c2412_setup_clocks,
-
        .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs),
 };