From 5470eb06c0b16fc477bd9793ac234ed6c9f56260 Mon Sep 17 00:00:00 2001
From: "Choi, Jong-Hwan" <jhbird.choi@samsung.com>
Date: Wed, 20 Jul 2011 20:33:03 +0000
Subject: [PATCH] --- yaml --- r: 256605 b: refs/heads/master c:
 e3dbc46c2a62688d1aaa1f7291a054fb2b502849 h: refs/heads/master i:   256603:
 efd4b81c750a95fba0ef94cc20ae038f833e6bf1 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 62e44ae9054b..8ee0a14f0052 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebbf9295b17ed605f31f45d9269adb216be3a181
+refs/heads/master: e3dbc46c2a62688d1aaa1f7291a054fb2b502849
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 44f96b24e869..34f3abc6457a 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -530,7 +530,7 @@ struct netdev_queue {
 	struct Qdisc		*qdisc;
 	unsigned long		state;
 	struct Qdisc		*qdisc_sleeping;
-#ifdef CONFIG_RPS
+#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
 	struct kobject		kobj;
 #endif
 #if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
@@ -1179,7 +1179,7 @@ struct net_device {
 
 	unsigned char		broadcast[MAX_ADDR_LEN];	/* hw bcast add	*/
 
-#ifdef CONFIG_RPS
+#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
 	struct kset		*queues_kset;
 
 	struct netdev_rx_queue	*_rx;