xps: Add CONFIG_XPS
authorTom Herbert <therbert@google.com>
Fri, 26 Nov 2010 08:36:09 +0000 (08:36 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Nov 2010 02:24:14 +0000 (18:24 -0800)
This patch adds XPS_CONFIG option to enable and disable XPS.  This is
done in the same manner as RPS_CONFIG.  This is also fixes build
failure in XPS code when SMP is not enabled.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netdevice.h
net/Kconfig
net/core/dev.c
net/core/net-sysfs.c
net/core/net-sysfs.h

Simple merge
diff --cc net/Kconfig
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge