From 0df33c653045e9c4878a192e0bf4c5fdbc453f9c Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Thu, 15 Apr 2010 00:16:59 -0700
Subject: [PATCH] --- yaml --- r: 194075 b: refs/heads/master c:
 fd793d8905720595caede6bd26c5df6c0ecd37f8 h: refs/heads/master i:   194073:
 dfcc545a851bb451734ad83b9f324a5efc5db67a   194071:
 8c222fb40ff7e0f0a3017117130c317db7c57880 v: v3

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

diff --git a/[refs] b/[refs]
index 55cbef6c5ce5..5e37facba7ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0e28f1effd1d840b36e961edc1def81e01b1ca1
+refs/heads/master: fd793d8905720595caede6bd26c5df6c0ecd37f8
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 470f7c951afb..55c2086e1f06 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1331,7 +1331,7 @@ struct softnet_data {
 	struct sk_buff		*completion_queue;
 
 	/* Elements below can be accessed between CPUs for RPS */
-#ifdef CONFIG_SMP
+#ifdef CONFIG_RPS
 	struct call_single_data	csd ____cacheline_aligned_in_smp;
 #endif
 	struct sk_buff_head	input_pkt_queue;