diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:04:04 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:04:04 +0100 |
| commit | 82fc0deb5fb5067c5207ace309b4e3af3eeec17b (patch) | |
| tree | b74cc762f65e4e8957098767b07e423f62cc38a4 /drivers/coresight/coresight-priv.h | |
| parent | e20e8b472345ea5babd805db6726d1a7000f7673 (diff) | |
| parent | 5210951a4876a42856434546d2789838d3e35f34 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.03-rt
Diffstat (limited to 'drivers/coresight/coresight-priv.h')
| -rw-r--r-- | drivers/coresight/coresight-priv.h | 2 |
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 |