diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 17:26:00 -0500 |
| commit | 33175d84ee3fa29991adb80513683e010769e807 (patch) | |
| tree | 3731f61cf82451b6892cf1368701e57e35d92908 /include/linux/netdevice.h | |
| parent | c5908939b2738bafe1b309bc2465cb9f2e6184c5 (diff) | |
| parent | 6dfbd87a20a737641ef228230c77f4262434fa24 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_cmn.c
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6bd5d460b7c1..7a071535c4c0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2557,6 +2557,9 @@ extern int netdev_notice(const struct net_device *dev, const char *format, ...) | |||
| 2557 | extern int netdev_info(const struct net_device *dev, const char *format, ...) | 2557 | extern int netdev_info(const struct net_device *dev, const char *format, ...) |
| 2558 | __attribute__ ((format (printf, 2, 3))); | 2558 | __attribute__ ((format (printf, 2, 3))); |
| 2559 | 2559 | ||
| 2560 | #define MODULE_ALIAS_NETDEV(device) \ | ||
| 2561 | MODULE_ALIAS("netdev-" device) | ||
| 2562 | |||
| 2560 | #if defined(DEBUG) | 2563 | #if defined(DEBUG) |
| 2561 | #define netdev_dbg(__dev, format, args...) \ | 2564 | #define netdev_dbg(__dev, format, args...) \ |
| 2562 | netdev_printk(KERN_DEBUG, __dev, format, ##args) | 2565 | netdev_printk(KERN_DEBUG, __dev, format, ##args) |