diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-14 08:53:42 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 08:53:42 -0400 |
| commit | b8ce9fb8e18af7466e0b915bb5979322cdace322 (patch) | |
| tree | eec6f9b58ce154fd863f0f78b374a697a5a7139b /include/linux/netdevice.h | |
| parent | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff) | |
| parent | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff) | |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ca333e79e10f..54b8b4d7b68f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2555,7 +2555,7 @@ extern void netdev_class_remove_file(struct class_attribute *class_attr); | |||
| 2555 | 2555 | ||
| 2556 | extern struct kobj_ns_type_operations net_ns_type_operations; | 2556 | extern struct kobj_ns_type_operations net_ns_type_operations; |
| 2557 | 2557 | ||
| 2558 | extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len); | 2558 | extern const char *netdev_drivername(const struct net_device *dev); |
| 2559 | 2559 | ||
| 2560 | extern void linkwatch_run_queue(void); | 2560 | extern void linkwatch_run_queue(void); |
| 2561 | 2561 | ||