Merge tag 'fcoe' into fixes

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 29ba35e6a143d0ef7ccdea34587a7749369cc101..f151c6cf27c336ffa756c68a69dc2d4dd20dfb8f 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -25,7 +25,7 @@ config DW_APB_TIMER_OF
 config ARMADA_370_XP_TIMER
        bool
 
-config SUNXI_TIMER
+config SUN4I_TIMER
        bool
 
 config VT8500_TIMER
@@ -76,3 +76,12 @@ config CLKSRC_EXYNOS_MCT
        def_bool y if ARCH_EXYNOS
        help
          Support for Multi Core Timer controller on Exynos SoCs.
+
+config CLKSRC_SAMSUNG_PWM
+       bool
+       select CLKSRC_MMIO
+       help
+         This is a new clocksource driver for the PWM timer found in
+         Samsung S3C, S5P and Exynos SoCs, replacing an earlier driver
+         for all devicetree enabled platforms. This driver will be
+         needed only on systems that do not have the Exynos MCT available.