From 05832bd594caad8830810fa3c08abd95ff7212db Mon Sep 17 00:00:00 2001
From: Tom Herbert <therbert@google.com>
Date: Mon, 22 Mar 2010 18:06:47 -0700
Subject: [PATCH] --- yaml --- r: 193647 b: refs/heads/master c:
 e880eb6c5c9d98e389ffc0d8947f75d70785361a h: refs/heads/master i:   193645:
 641a1bf5c395049077d419d6e4b00ab978a174e2   193643:
 15d59948912318d483322e35bf3d29ac344dc2b0   193639:
 a3e1e9ba1662b59f9f8f124b463993920b31b1bb   193631:
 1f276e26b83ca071bee4ac3b1d59f2caa2effa14 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/net-sysfs.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 04a2fc98482e..d065d099b550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f60a220b33832ae4e2622b913f138892b6fe7b
+refs/heads/master: e880eb6c5c9d98e389ffc0d8947f75d70785361a
diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c
index 7a46343d5ae3..f6b6bfee72ae 100644
--- a/trunk/net/core/net-sysfs.c
+++ b/trunk/net/core/net-sysfs.c
@@ -739,7 +739,9 @@ void netdev_unregister_kobject(struct net_device * net)
 	if (!net_eq(dev_net(net), &init_net))
 		return;
 
+#ifdef CONFIG_SYSFS
 	rx_queue_remove_kobjects(net);
+#endif
 
 	device_del(dev);
 }
@@ -780,11 +782,13 @@ int netdev_register_kobject(struct net_device *net)
 	if (error)
 		return error;
 
+#ifdef CONFIG_SYSFS
 	error = rx_queue_register_kobjects(net);
 	if (error) {
 		device_del(dev);
 		return error;
 	}
+#endif
 
 	return error;
 }