diff options
| author | Jeff Garzik | 2008-10-16 11:09:31 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2008-10-16 11:09:31 +0200 |
| commit | 5dd2d3322836036da169904afcb7d0f6dff5363f (patch) | |
| tree | 0ae7a4c1041e7d7a821ce8a4c7e0edcdaa11b2e4 /drivers/net/ixgbe/ixgbe.h | |
| parent | decnet: Fix compiler warning in dn_dev.c (diff) | |
| download | kernel-qcow2-linux-5dd2d3322836036da169904afcb7d0f6dff5363f.tar.gz kernel-qcow2-linux-5dd2d3322836036da169904afcb7d0f6dff5363f.tar.xz kernel-qcow2-linux-5dd2d3322836036da169904afcb7d0f6dff5363f.zip | |
[netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA
We cannot select INTEL_IOATDMA in Kconfig as soon as MYRI10GE or IXGBE
is enabled since the former is not available on all architectures.
Just use a Kconfig bool {IXGBE,MYRI10GE}_DCA set to =y when DCA
support can actually be built.
[myri10ge portion written and signed-off-by] Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe.h')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h index 2198b77c53ed..e116d340dcc6 100644 --- a/drivers/net/ixgbe/ixgbe.h +++ b/drivers/net/ixgbe/ixgbe.h @@ -36,7 +36,7 @@ #include "ixgbe_type.h" #include "ixgbe_common.h" -#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE) +#ifdef CONFIG_IXGBE_DCA #include <linux/dca.h> #endif @@ -136,7 +136,7 @@ struct ixgbe_ring { * offset associated with this ring, which is different * for DCE and RSS modes */ -#if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE) +#ifdef CONFIG_IXGBE_DCA /* cpu for tx queue */ int cpu; #endif |