[RFC PATCH 11/18] clocksource: qcom: make mach-msm and mach-qcom coexist

Arnd Bergmann arnd at arndb.de
Wed Mar 4 11:33:05 PST 2015

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 at arndb.de>
 drivers/clocksource/qcom-timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
 static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source,
 				u32 sts)

More information about the linux-arm-kernel mailing list