diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
| commit | 8aaaaf3cbfb96a9f74c5775c71067a9290244ec7 (patch) | |
| tree | 67349c6a69740150b67c4c39de49cde9b3648aa5 /arch/arm/mach-s3c2440/s3c2440-cpufreq.c | |
| parent | 94f61a7666224ab307e387ff0d146055ae77e6ab (diff) | |
| parent | e29206381a1436e0f47c0f5b9a23159a03c57715 (diff) | |
Merge branch 'fbdev-for-linus' into fbdev-next
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c2440-cpufreq.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c2440-cpufreq.c | 3 |
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 cf7596694ef..61776764d9f 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"); |