diff --git a/[refs] b/[refs] index 3fa296b7586d..f71f0e442c7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b5ff97d2c46c52d2a86208509633230c9a486ec +refs/heads/master: 77d844344952934baf2902cf6f1ac870dc1b4d7a diff --git a/trunk/drivers/clocksource/Kconfig b/trunk/drivers/clocksource/Kconfig index 03caba2540e2..ff5b6d87d65a 100644 --- a/trunk/drivers/clocksource/Kconfig +++ b/trunk/drivers/clocksource/Kconfig @@ -69,7 +69,7 @@ config CLKSRC_METAG_GENERIC This option enables support for the Meta per-thread timers. config CLKSRC_SAMSUNG_PWM - def_bool ARCH_EXYNOS4 + bool depends on OF select CLKSRC_MMIO help