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;