diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-27 19:51:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-27 19:51:21 -0400 |
| commit | 281c7413ed914623d3245299a4761b6b27ab9fdb (patch) | |
| tree | 182b5222a7ad4b77c32f7845ea777ca665d7def2 /drivers/scsi/libsrp.c | |
| parent | 2ab61b01110aa04cd853c619a74881e3225a5e24 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/libsrp.c')
| -rw-r--r-- | drivers/scsi/libsrp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c index 6d6a76e65a6c..15e2d132e8b9 100644 --- a/drivers/scsi/libsrp.c +++ b/drivers/scsi/libsrp.c | |||
| @@ -39,7 +39,7 @@ enum srp_task_attributes { | |||
| 39 | /* tmp - will replace with SCSI logging stuff */ | 39 | /* tmp - will replace with SCSI logging stuff */ |
| 40 | #define eprintk(fmt, args...) \ | 40 | #define eprintk(fmt, args...) \ |
| 41 | do { \ | 41 | do { \ |
| 42 | printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ | 42 | printk("%s(%d) " fmt, __func__, __LINE__, ##args); \ |
| 43 | } while (0) | 43 | } while (0) |
| 44 | /* #define dprintk eprintk */ | 44 | /* #define dprintk eprintk */ |
| 45 | #define dprintk(fmt, args...) | 45 | #define dprintk(fmt, args...) |