summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
diff options
context:
space:
mode:
authorHeiko Stuebner2012-01-27 07:35:25 +0100
committerKukjin Kim2012-01-27 07:35:47 +0100
commit04511a6faeed146030dcc5b892beff30fa0a7c9b (patch)
tree6b57884f33f018cfd781630a1f5542f43f174c79 /arch/arm/mach-s3c2440/s3c2440-cpufreq.c
parentARM: EXYNOS: Fix "warning: initialization from incompatible pointer type" (diff)
downloadkernel-qcow2-linux-04511a6faeed146030dcc5b892beff30fa0a7c9b.tar.gz
kernel-qcow2-linux-04511a6faeed146030dcc5b892beff30fa0a7c9b.tar.xz
kernel-qcow2-linux-04511a6faeed146030dcc5b892beff30fa0a7c9b.zip
ARM: SAMSUNG: Fix missing api-change from subsys_interface change
Commit 4a858cfc9a (arm: convert sysdev_class to a regular subsystem) converted the samsung sysdevs into subsys_interface instances. While the original add-function only had a (struct sys_device *) parameter, the dev_add from subsys_interface needs (struct device *, struct subsys_interface *) leading to "initialized from incompatible pointer type" warnings. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c2440-cpufreq.c')
-rw-r--r--arch/arm/mach-s3c2440/s3c2440-cpufreq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c b/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
index cf7596694efe..61776764d9f4 100644
--- a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
+++ b/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
@@ -270,7 +270,8 @@ struct s3c_cpufreq_info s3c2440_cpufreq_info = {
.debug_io_show = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
};
-static int s3c2440_cpufreq_add(struct device *dev)
+static int s3c2440_cpufreq_add(struct device *dev,
+ struct subsys_interface *sif)
{
xtal = s3c_cpufreq_clk_get(NULL, "xtal");
hclk = s3c_cpufreq_clk_get(NULL, "hclk");