Merge tag 'upstream-3.6-rc5' of git://git.infradead.org/linux-ubi

[~andy/linux] / net / core / net-sysfs.h

diff --git a/net/core/net-sysfs.h b/net/core/net-sysfs.h
index 778e1571548d6aac4e931b96e6a3b2363b8baca5..bd7751ec1c4d63d50163438958480a7261a234e7 100644 (file)
--- a/net/core/net-sysfs.h
+++ b/net/core/net-sysfs.h
@@ -4,8 +4,8 @@
 int netdev_kobject_init(void);
 int netdev_register_kobject(struct net_device *);
 void netdev_unregister_kobject(struct net_device *);
-#ifdef CONFIG_RPS
 int net_rx_queue_update_kobjects(struct net_device *, int old_num, int new_num);
-#endif
+int netdev_queue_update_kobjects(struct net_device *net,
+                                int old_num, int new_num);
 
 #endif