diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-23 13:22:59 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-07-23 13:27:23 +0200 |
| commit | 1af447bd8cbfb808a320885d214555fb2d32e6e6 (patch) | |
| tree | 8b24a66b9d66b25479ffff4999a2d5ec9ffb0010 /include/linux/sh_timer.h | |
| parent | 5442e9fbd7c23172a1c9bc736629cd123a9923f0 (diff) | |
| parent | 3252a646aa2cf706b2a26433a8bd9cb2e5dce410 (diff) | |
Merge branch 'clockevents/3.17' of git://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevents from Danel Lezcano:
* New timer driver for the Cirrus Logic CLPS711X SoC
* New driver for the Mediatek SoC which includes:
* A new function for of, acked by Rob Herring
* Move the PXA driver to drivers/clocksource, add DT support
* Optimization of the exynos_mct driver
* DT support for the renesas timers family.
* Some Kconfig and driver fixlets
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; }; |