diff options
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/clocksource/fsl_ftm_timer.c | 4 | 
2 files changed, 3 insertions, 2 deletions
| diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 71cfdf7c9708..2eb5f0efae90 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -1,4 +1,5 @@  menu "Clock Source drivers" +	depends on !ARCH_USES_GETTIMEOFFSET  config CLKSRC_OF  	bool diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 10202f1fdfd7..517e1c7624d4 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -203,7 +203,7 @@ static int __init ftm_clockevent_init(unsigned long freq, int irq)  	int err;  	ftm_writel(0x00, priv->clkevt_base + FTM_CNTIN); -	ftm_writel(~0UL, priv->clkevt_base + FTM_MOD); +	ftm_writel(~0u, priv->clkevt_base + FTM_MOD);  	ftm_reset_counter(priv->clkevt_base); @@ -230,7 +230,7 @@ static int __init ftm_clocksource_init(unsigned long freq)  	int err;  	ftm_writel(0x00, priv->clksrc_base + FTM_CNTIN); -	ftm_writel(~0UL, priv->clksrc_base + FTM_MOD); +	ftm_writel(~0u, priv->clksrc_base + FTM_MOD);  	ftm_reset_counter(priv->clksrc_base); | 
