diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-10-15 07:42:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-10-15 07:42:29 -0700 |
| commit | 49ac163bd46262d18e6236c2fc8dedcd905adac4 (patch) | |
| tree | d33cc801e0b277740401adfbc15d75dff7585cb7 /include/linux | |
| parent | 01d259fe61c43fe659b9e94d098288c50bdc6c61 (diff) | |
| parent | 57bcaf82e01953b674bf3e44895f103369a2338c (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/network-2.5
into nuts.ninka.net:/disk1/davem/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 03936a77f3da..2a53de551b53 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -511,7 +511,11 @@ extern struct net_device *__dev_get_by_flags(unsigned short flags, unsigned short mask); extern struct net_device *dev_get_by_name(const char *name); extern struct net_device *__dev_get_by_name(const char *name); -extern struct net_device *dev_alloc(const char *name, int *err); +extern struct net_device *__dev_alloc(const char *name, int *err); +static inline __deprecated struct net_device *dev_alloc(const char *name, int *err) +{ + return __dev_alloc(name, err); +} extern int dev_alloc_name(struct net_device *dev, const char *name); extern int dev_open(struct net_device *dev); extern int dev_close(struct net_device *dev); |