diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c')
| -rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index 3f808b629242..6d31f2a98abf 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |||
| @@ -173,7 +173,7 @@ static const u32 toshiba_rbtx4927_irq_debug_flag = | |||
| 173 | { \ | 173 | { \ |
| 174 | char tmp[100]; \ | 174 | char tmp[100]; \ |
| 175 | sprintf( tmp, str ); \ | 175 | sprintf( tmp, str ); \ |
| 176 | printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ | 176 | printk( "%s(%s:%u)::%s", __func__, __FILE__, __LINE__, tmp ); \ |
| 177 | } | 177 | } |
| 178 | #else | 178 | #else |
| 179 | #define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...) | 179 | #define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...) |