diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 13:39:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 13:40:01 +0100 |
| commit | 4d8cfec692e988b844dcaeaeb76b5780b7ef9d28 (patch) | |
| tree | 67d43adab2afd18a74d08f347e3676ae1a64193f /arch/arm/mach-s3c2412/cpu-freq.c | |
| parent | Merge branch 'davinci/cleanups' into next/cleanup (diff) | |
| parent | rtc: sa1100: remove verification code of alarm (diff) | |
| download | linux-4d8cfec692e988b844dcaeaeb76b5780b7ef9d28.tar.xz linux-4d8cfec692e988b844dcaeaeb76b5780b7ef9d28.zip | |
Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup
* 'cleanup-3.4' of git://github.com/hzhuang1/linux: (2 commits)
rtc: sa1100: remove verification code of alarm
rtc: sa1100: remove periodic code
(update to v3.3-rc5)
Diffstat (limited to 'arch/arm/mach-s3c2412/cpu-freq.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/cpu-freq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c2412/cpu-freq.c index d8664b7652ce..125be7d5fa60 100644 --- a/arch/arm/mach-s3c2412/cpu-freq.c +++ b/arch/arm/mach-s3c2412/cpu-freq.c @@ -194,7 +194,8 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = { .debug_io_show = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs), }; -static int s3c2412_cpufreq_add(struct device *dev) +static int s3c2412_cpufreq_add(struct device *dev, + struct subsys_interface *sif) { unsigned long fclk_rate; |