diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 08:15:49 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 08:15:49 +0200 |
| commit | 9aa7719e0c6a1580451900e672744752804f8f75 (patch) | |
| tree | ba36c5536342db2759d0a1843dffd0c193e26ff0 /arch/sparc/kernel/time_64.c | |
| parent | drivers: sh: resume enabled clocks fix (diff) | |
| parent | Linux 3.0-rc3 (diff) | |
| download | linux-9aa7719e0c6a1580451900e672744752804f8f75.tar.xz linux-9aa7719e0c6a1580451900e672744752804f8f75.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/sparc/kernel/time_64.c')
| -rw-r--r-- | arch/sparc/kernel/time_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index 2b8d54b2d850..1db6b18964d2 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c @@ -708,7 +708,7 @@ static void sparc64_timer_setup(enum clock_event_mode mode, case CLOCK_EVT_MODE_UNUSED: WARN_ON(1); break; - }; + } } static struct clock_event_device sparc64_clockevent = { |