diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /arch/sh/kernel/timers | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'arch/sh/kernel/timers')
| -rw-r--r-- | arch/sh/kernel/timers/timer-cmt.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/timers/timer-mtu2.c | 2 |
2 files changed, 2 insertions, 2 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 |
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c index ade9d6eb29f9..fe453c01f9c9 100644 --- a/arch/sh/kernel/timers/timer-mtu2.c +++ b/arch/sh/kernel/timers/timer-mtu2.c | |||
| @@ -76,7 +76,7 @@ static unsigned long mtu2_timer_get_offset(void) | |||
| 76 | count -= LATCH; | 76 | count -= LATCH; |
| 77 | } else { | 77 | } else { |
| 78 | printk("%s (): hardware timer problem?\n", | 78 | printk("%s (): hardware timer problem?\n", |
| 79 | __FUNCTION__); | 79 | __func__); |
| 80 | } | 80 | } |
| 81 | } | 81 | } |
| 82 | } else | 82 | } else |