summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vc.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-30 09:12:33 -0800
committerOlof Johansson <olof@lixom.net>2012-11-30 09:12:33 -0800
commit5c1af2a7011bf719807de360cb64c2f610269a38 (patch)
treefc4e6657d30c6eb48367c40e50c6b7428f96aaea /arch/arm/mach-omap2/vc.c
parentef7848683f4de4903376638b69e6b4ac729b3ead (diff)
parent573e5bbe653d01dc0f27e2d97754db9246b501c8 (diff)
downloadop-kernel-dev-5c1af2a7011bf719807de360cb64c2f610269a38.zip
op-kernel-dev-5c1af2a7011bf719807de360cb64c2f610269a38.tar.gz
Merge branch 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/pm
From Kukjin Kim: * 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Add flush_cache_all in suspend finisher ARM: EXYNOS: Remove scu_enable from cpuidle ARM: EXYNOS: Fix soft reboot hang after suspend/resume ARM: EXYNOS: Add support for rtc wakeup ARM: EXYNOS: fix the hotplug for Cortex-A15 + Linux 3.7-rc6
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
-rw-r--r--arch/arm/mach-omap2/vc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index a89ec8a..49ac797 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -619,7 +619,7 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm)
if (initialized) {
if (voltdm->pmic->i2c_high_speed != i2c_high_speed)
- pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).",
+ pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).\n",
__func__, voltdm->name, i2c_high_speed);
return;
}
OpenPOWER on IntegriCloud