| Message ID | 1425497592-1831064-12-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c index 098c542e5c53..48c8df62f49a 100644 --- a/drivers/clocksource/qcom-timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -285,8 +285,9 @@ static void __init msm_dt_timer_init(struct device_node *np) } CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); -#else +#endif +#ifdef CONFIG_ARCH_MSM static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source, u32 sts) {
The driver uses #if/#else to decide which initialization code should be used, which of course breaks if we have both in the same kernel. This changes the #else path to check for ARCH_MSM. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/clocksource/qcom-timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)