diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-07 22:07:57 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-07 22:07:57 +0400 |
| commit | 82df9c8bebeff610705f30315f3903cbcb3aa58b (patch) | |
| tree | 0d54eac4e7b46876111256caf169b22627441453 /include/linux/sh_timer.h | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
| parent | ccbf62d8a284cf181ac28c8e8407dd077d90dd4b (diff) | |
| download | linux-82df9c8bebeff610705f30315f3903cbcb3aa58b.tar.xz | |
Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next
backmerge to avoid kernel/acct.c conflict
Diffstat (limited to 'include/linux/sh_timer.h')
| -rw-r--r-- | include/linux/sh_timer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/sh_timer.h b/include/linux/sh_timer.h index 8e1e036d6d45..64638b058076 100644 --- a/include/linux/sh_timer.h +++ b/include/linux/sh_timer.h @@ -2,11 +2,6 @@ #define __SH_TIMER_H__ struct sh_timer_config { - char *name; - long channel_offset; - int timer_bit; - unsigned long clockevent_rating; - unsigned long clocksource_rating; unsigned int channels_mask; }; |