diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:40:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 15:40:45 +1100 |
| commit | 93ae1a8e0e4ebaf960de8affa746fdac955c49b9 (patch) | |
| tree | bef784ee12a60cb34bab91f9eb81f5d797bb2904 /net | |
| parent | 33f839f5fb99702be82b59c122eafae353d53747 (diff) | |
| parent | 0cae60f91494e34a0c5391f1455f825d5849b05f (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/mmc/host/mvsdio.c
drivers/pci/pci-driver.c
drivers/pci/pci-sysfs.c
include/linux/netdevice.h
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/net-sysfs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index d03f2c9750fa..f3edf9635e02 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1344,17 +1344,19 @@ int netdev_register_kobject(struct net_device *net) return error; } -int netdev_class_create_file(struct class_attribute *class_attr) +int netdev_class_create_file_ns(struct class_attribute *class_attr, + const void *ns) { - return class_create_file(&net_class, class_attr); + return class_create_file_ns(&net_class, class_attr, ns); } -EXPORT_SYMBOL(netdev_class_create_file); +EXPORT_SYMBOL(netdev_class_create_file_ns); -void netdev_class_remove_file(struct class_attribute *class_attr) +void netdev_class_remove_file_ns(struct class_attribute *class_attr, + const void *ns) { - class_remove_file(&net_class, class_attr); + class_remove_file_ns(&net_class, class_attr, ns); } -EXPORT_SYMBOL(netdev_class_remove_file); +EXPORT_SYMBOL(netdev_class_remove_file_ns); int netdev_kobject_init(void) { |