diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /include/linux/netdevice.h | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index bd8b4ca85a2a..493b065f76d7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -1085,6 +1085,7 @@ extern void synchronize_net(void); | |||
| 1085 | extern int register_netdevice_notifier(struct notifier_block *nb); | 1085 | extern int register_netdevice_notifier(struct notifier_block *nb); |
| 1086 | extern int unregister_netdevice_notifier(struct notifier_block *nb); | 1086 | extern int unregister_netdevice_notifier(struct notifier_block *nb); |
| 1087 | extern int init_dummy_netdev(struct net_device *dev); | 1087 | extern int init_dummy_netdev(struct net_device *dev); |
| 1088 | extern void netdev_resync_ops(struct net_device *dev); | ||
| 1088 | 1089 | ||
| 1089 | extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev); | 1090 | extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev); |
| 1090 | extern struct net_device *dev_get_by_index(struct net *net, int ifindex); | 1091 | extern struct net_device *dev_get_by_index(struct net *net, int ifindex); |