diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 15:39:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 15:39:13 -0400 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-shmobile/setup-sh7377.c | |
| parent | 8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff) | |
| parent | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-shmobile/setup-sh7377.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-sh7377.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh7377.c b/arch/arm/mach-shmobile/setup-sh7377.c index bb4adf17dbf..575dbd6c2f1 100644 --- a/arch/arm/mach-shmobile/setup-sh7377.c +++ b/arch/arm/mach-shmobile/setup-sh7377.c | |||
| @@ -172,7 +172,6 @@ static struct sh_timer_config cmt10_platform_data = { | |||
| 172 | .name = "CMT10", | 172 | .name = "CMT10", |
| 173 | .channel_offset = 0x10, | 173 | .channel_offset = 0x10, |
| 174 | .timer_bit = 0, | 174 | .timer_bit = 0, |
| 175 | .clk = "r_clk", | ||
| 176 | .clockevent_rating = 125, | 175 | .clockevent_rating = 125, |
| 177 | .clocksource_rating = 125, | 176 | .clocksource_rating = 125, |
| 178 | }; | 177 | }; |