diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-30 00:05:23 +0200 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-30 00:05:23 +0200 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /drivers/scsi/scsi_tgt_priv.h | |
| parent | power_supply: Sharp SL-6000 (tosa) batteries support (diff) | |
| parent | Linux 2.6.27-rc1 (diff) | |
| download | linux-9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6.tar.xz linux-9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6.zip | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'drivers/scsi/scsi_tgt_priv.h')
| -rw-r--r-- | drivers/scsi/scsi_tgt_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_tgt_priv.h b/drivers/scsi/scsi_tgt_priv.h index cb92888948f9..fe4c62177f78 100644 --- a/drivers/scsi/scsi_tgt_priv.h +++ b/drivers/scsi/scsi_tgt_priv.h @@ -6,7 +6,7 @@ struct task_struct; /* tmp - will replace with SCSI logging stuff */ #define eprintk(fmt, args...) \ do { \ - printk("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ + printk("%s(%d) " fmt, __func__, __LINE__, ##args); \ } while (0) #define dprintk(fmt, args...) |