diff options
author | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-01-05 12:51:32 -0600 |
commit | d76fe430665fac3f44ee88958713ecc524fd778d (patch) | |
tree | 00206c8b11eb2084d38eeccfe4b41f5e89fb779c /arch/arm/plat-mxc/cpufreq.c | |
parent | 63076d7f7f7f2650e5d0a4fa5dd2c412a255c237 (diff) | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) |
Merge commit 'v3.2' into rt-3.2-rt9v3.2-rt9
Diffstat (limited to 'arch/arm/plat-mxc/cpufreq.c')
-rw-r--r-- | arch/arm/plat-mxc/cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c index adbff706ef6f..73db34bf588a 100644 --- a/arch/arm/plat-mxc/cpufreq.c +++ b/arch/arm/plat-mxc/cpufreq.c @@ -98,7 +98,7 @@ static int mxc_set_target(struct cpufreq_policy *policy, return ret; } -static int __init mxc_cpufreq_init(struct cpufreq_policy *policy) +static int mxc_cpufreq_init(struct cpufreq_policy *policy) { int ret; int i; |