diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/sh/kernel/timers/timer-cmt.c | |
parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sh/kernel/timers/timer-cmt.c')
-rw-r--r-- | arch/sh/kernel/timers/timer-cmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c index 71312324b5de..d20c8c375881 100644 --- a/arch/sh/kernel/timers/timer-cmt.c +++ b/arch/sh/kernel/timers/timer-cmt.c | |||
@@ -77,7 +77,7 @@ static unsigned long cmt_timer_get_offset(void) | |||
77 | count -= LATCH; | 77 | count -= LATCH; |
78 | } else { | 78 | } else { |
79 | printk("%s (): hardware timer problem?\n", | 79 | printk("%s (): hardware timer problem?\n", |
80 | __FUNCTION__); | 80 | __func__); |
81 | } | 81 | } |
82 | } | 82 | } |
83 | } else | 83 | } else |