aboutsummaryrefslogtreecommitdiff
path: root/drivers/coresight/coresight-priv.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-03 09:32:58 +0000
committerMark Brown <broonie@kernel.org>2015-03-03 09:32:58 +0000
commit426bf85880ce1f08afa33e44b83961e231ec923e (patch)
treeffadbdda6709741477b0a15c3b9703a01af2ce79 /drivers/coresight/coresight-priv.h
parentd9161136f8f65a83983ce24c651d3ea1381f031d (diff)
parentf05198eee5f3c7516a55d61ef5b97dfca34af549 (diff)
downloadlinux-linaro-stable-v3.14/topic/coresight.tar.gz
Merge branch 'v3.14-backport' of http://git.linaro.org/people/mathieu.poirier/coresight into lsk-v3.14-coresightv3.14/topic/coresight
Diffstat (limited to 'drivers/coresight/coresight-priv.h')
-rw-r--r--drivers/coresight/coresight-priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/coresight/coresight-priv.h b/drivers/coresight/coresight-priv.h
index 7b3372fca4f6..62fcd98cc7cf 100644
--- a/drivers/coresight/coresight-priv.h
+++ b/drivers/coresight/coresight-priv.h
@@ -57,7 +57,7 @@ extern int etm_readl_cp14(u32 off, unsigned int *val);
extern int etm_writel_cp14(u32 off, u32 val);
#else
static inline int etm_readl_cp14(u32 off, unsigned int *val) { return 0; }
-static inline int etm_writel_cp14(u32 val, u32 off) { return 0; }
+static inline int etm_writel_cp14(u32 off, u32 val) { return 0; }
#endif
#endif