aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/cpufreq.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-30 13:43:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-30 13:43:45 -0800
commit604a16b74c8ca2fd29861723a62ad57f0c692333 (patch)
tree4f90ac336c6811aa5a3088a626012b707b824746 /arch/arm/plat-mxc/cpufreq.c
parentc63c4edcc8cf0f1ed2c6a1c9ba7a56bc50aa8199 (diff)
parent00ca4e4c8f72f2a67466a41b12714ed8c9e10f64 (diff)
downloadlinux-linaro-604a16b74c8ca2fd29861723a62ad57f0c692333.tar.gz
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: plat-orion: make gpiochip label unique enable uncompress log on cpuimx35sd cpuimx35: fix touchscreen support cpuimx35sd: fix Kconfig clock-imx35: fix reboot in internal boot mode dma: MX3_IPU fix depends imx_v4_v5_defconfig: update default configuration cpuimx25sd: fix Kconfig arm/imx: fix cpufreq section mismatch ARM:imx:fix pwm period value ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3
Diffstat (limited to 'arch/arm/plat-mxc/cpufreq.c')
-rw-r--r--arch/arm/plat-mxc/cpufreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c
index adbff706ef6..73db34bf588 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;