diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /drivers/net/netxen/netxen_nic.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'drivers/net/netxen/netxen_nic.h')
| -rw-r--r-- | drivers/net/netxen/netxen_nic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index 244ab49c4337..f8e601c51da7 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
| @@ -742,7 +742,7 @@ extern char netxen_nic_driver_name[]; | |||
| 742 | } while (0) | 742 | } while (0) |
| 743 | #else | 743 | #else |
| 744 | #define DPRINTK(klevel, fmt, args...) do { \ | 744 | #define DPRINTK(klevel, fmt, args...) do { \ |
| 745 | printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\ | 745 | printk(KERN_##klevel PFX "%s: %s: " fmt, __func__,\ |
| 746 | (adapter != NULL && adapter->netdev != NULL) ? \ | 746 | (adapter != NULL && adapter->netdev != NULL) ? \ |
| 747 | adapter->netdev->name : NULL, \ | 747 | adapter->netdev->name : NULL, \ |
| 748 | ## args); } while(0) | 748 | ## args); } while(0) |