summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2014-07-23 14:00:00 +0400
committerDaniel Lezcano <daniel.lezcano@linaro.org>2014-07-23 14:00:00 +0400
commitde2ea58155413f8914169b7183107f4ea5c6521f (patch)
treecd33b60fc32e0c156d1f41e2a1498bd88e0d66c5 /include
parentafdb094380889222583df9ef803587f6b8a82c8d (diff)
parentcca8d0596c4c7acb371ea1bc5eee9b404b30516a (diff)
downloadlinux-de2ea58155413f8914169b7183107f4ea5c6521f.tar.xz
Merge branch 'clockevents/renesas-timers-dt' into clockevents/3.17
Diffstat (limited to 'include')
-rw-r--r--include/linux/sh_timer.h5
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;
};