From bac5fa4b9394285015ef95113ece9a87dc3d87e9 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 4 Dec 2011 12:38:00 +0000
Subject: [PATCH] --- yaml --- r: 278367 b: refs/heads/master c:
 b474ae77609b725098d5a7cc8f69c1c528710d53 h: refs/heads/master i:   278365:
 ca2b57daf7f76b3aee4f4d33b37337f9e89121e3   278363:
 cd67613f22ffbfa2f078327e33909aeb4fba86ae   278359:
 8d3bfab40c4b9d70284c05a45c682bb66dc4e016   278351:
 4520cae25bc58ee99f375b53e47114a95267b80b   278335:
 2792e9984619bb0437d32ddaccf1388be301da60 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/net-sysfs.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 620a96563d4d..fbf2d9ad0303 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fa48bf3c75069d636fc8830743c929a062e80dc
+refs/heads/master: b474ae77609b725098d5a7cc8f69c1c528710d53
diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c
index 3bf72b638d34..9d134636f87c 100644
--- a/trunk/net/core/net-sysfs.c
+++ b/trunk/net/core/net-sysfs.c
@@ -1221,9 +1221,7 @@ static void netdev_queue_release(struct kobject *kobj)
 
 static struct kobj_type netdev_queue_ktype = {
 	.sysfs_ops = &netdev_queue_sysfs_ops,
-#ifdef CONFIG_XPS
 	.release = netdev_queue_release,
-#endif
 	.default_attrs = netdev_queue_default_attrs,
 };