diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 19:15:41 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 19:15:41 +0000 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /drivers/watchdog/machzwd.c | |
| parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
| parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
| download | linux-3.10-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.tar.gz linux-3.10-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.tar.bz2 linux-3.10-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/watchdog/machzwd.c')
| -rw-r--r-- | drivers/watchdog/machzwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index e6e07b4575e..6905135a776 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c @@ -141,7 +141,7 @@ static unsigned long next_heartbeat = 0; #ifndef ZF_DEBUG # define dprintk(format, args...) #else -# define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __FUNCTION__, __LINE__ , ## args) +# define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __func__, __LINE__ , ## args) #endif |