OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9
[android-x86/kernel.git]
/
arch
/
arm
/
mach-exynos4
/
time.c
diff --git
a/arch/arm/mach-exynos4/time.c
b/arch/arm/mach-exynos4/time.c
index
86b9fa0
..
ebb8f38
100644
(file)
--- a/
arch/arm/mach-exynos4/time.c
+++ b/
arch/arm/mach-exynos4/time.c
@@
-206,6
+206,7
@@
static cycle_t exynos4_pwm4_read(struct clocksource *cs)
return (cycle_t) ~__raw_readl(S3C_TIMERREG(0x40));
}
return (cycle_t) ~__raw_readl(S3C_TIMERREG(0x40));
}
+#ifdef CONFIG_PM
static void exynos4_pwm4_resume(struct clocksource *cs)
{
unsigned long pclk;
static void exynos4_pwm4_resume(struct clocksource *cs)
{
unsigned long pclk;
@@
-218,6
+219,7
@@
static void exynos4_pwm4_resume(struct clocksource *cs)
exynos4_pwm_init(4, ~0);
exynos4_pwm_start(4, 1);
}
exynos4_pwm_init(4, ~0);
exynos4_pwm_start(4, 1);
}
+#endif
struct clocksource pwm_clocksource = {
.name = "pwm_timer4",
struct clocksource pwm_clocksource = {
.name = "pwm_timer4",