diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 13:54:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 13:54:23 -0500 |
| commit | 934648f0449fae00946f55d64cd998bb5587fa1f (patch) | |
| tree | a8c5e55cfbfff34497f6ec873ea31725fdb849ab /include/linux/sh_timer.h | |
| parent | 8be5814c45d1412c6c16cf9be73e507f5fe53c1b (diff) | |
| parent | 65670a1b75874cf36c81456f2fb1e5ef6c6c0a55 (diff) | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
mmc: sh_mmcif: Convert extern inline to static inline.
ARM: mach-shmobile: Allow GPIO chips to register IRQ mappings.
ARM: mach-shmobile: fix sh7372 after a recent clock framework rework
ARM: mach-shmobile: include drivers/sh/Kconfig
ARM: mach-shmobile: ap4evb: Add HDMI sound support
ARM: mach-shmobile: clock-sh7372: Add FSIDIV clock support
ARM: shmobile: remove sh_timer_config clk member
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 | }; |