diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-04-23 10:01:02 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-04-23 10:01:02 +0900 |
| commit | 1c41ecb60b3de08d341be13de1dfc3d907b82694 (patch) | |
| tree | 36918914f8925b41a52189878e097f7347bc8d69 /include/linux | |
| parent | d3a088d459aeb2bd8c96110958acd50875f1e731 (diff) | |
| parent | 346f5e76b3822a2530a03f33b00ee89dfc463326 (diff) | |
Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' of git://git.linaro.org/people/daniel.lezcano/linux into cmt-mtu2-tmu-cleanups-for-v3.16
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sh_timer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sh_timer.h b/include/linux/sh_timer.h index 4d9dcd138315..8e1e036d6d45 100644 --- a/include/linux/sh_timer.h +++ b/include/linux/sh_timer.h @@ -7,6 +7,7 @@ struct sh_timer_config { int timer_bit; unsigned long clockevent_rating; unsigned long clocksource_rating; + unsigned int channels_mask; }; #endif /* __SH_TIMER_H__ */ |