diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-07 19:51:41 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-07 19:51:41 -0500 |
| commit | 65670a1b75874cf36c81456f2fb1e5ef6c6c0a55 (patch) | |
| tree | 48aa7cfb7a6a5521727a272d7dcfdc7083966513 /include/linux/sh_timer.h | |
| parent | 151f52f09c5728ecfdd0c289da1a4b30bb416f2c (diff) | |
| parent | 2f6ba5792ce9e4a731baeb976ccc72e0cf43d20b (diff) | |
Merge branch 'rmobile/core' into rmobile-fixes-for-linus
Diffstat (limited to 'include/linux/sh_timer.h')
| -rw-r--r-- | include/linux/sh_timer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sh_timer.h b/include/linux/sh_timer.h index 864bd56bd3b0..4d9dcd138315 100644 --- a/include/linux/sh_timer.h +++ b/include/linux/sh_timer.h | |||
| @@ -5,7 +5,6 @@ struct sh_timer_config { | |||
| 5 | char *name; | 5 | char *name; |
| 6 | long channel_offset; | 6 | long channel_offset; |
| 7 | int timer_bit; | 7 | int timer_bit; |
| 8 | char *clk; | ||
| 9 | unsigned long clockevent_rating; | 8 | unsigned long clockevent_rating; |
| 10 | unsigned long clocksource_rating; | 9 | unsigned long clocksource_rating; |
| 11 | }; | 10 | }; |