diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-10-16 05:09:31 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-10-16 05:09:31 -0400 |
commit | 5dd2d3322836036da169904afcb7d0f6dff5363f (patch) | |
tree | 0ae7a4c1041e7d7a821ce8a4c7e0edcdaa11b2e4 /drivers/net/ixgbe/ixgbe.h | |
parent | 8fa0b315fc0c1a414da1371f1fc39523a657c192 (diff) |
[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 @@ | |||
36 | #include "ixgbe_type.h" | 36 | #include "ixgbe_type.h" |
37 | #include "ixgbe_common.h" | 37 | #include "ixgbe_common.h" |
38 | 38 | ||
39 | #if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE) | 39 | #ifdef CONFIG_IXGBE_DCA |
40 | #include <linux/dca.h> | 40 | #include <linux/dca.h> |
41 | #endif | 41 | #endif |
42 | 42 | ||
@@ -136,7 +136,7 @@ struct ixgbe_ring { | |||
136 | * offset associated with this ring, which is different | 136 | * offset associated with this ring, which is different |
137 | * for DCE and RSS modes */ | 137 | * for DCE and RSS modes */ |
138 | 138 | ||
139 | #if defined(CONFIG_DCA) || defined(CONFIG_DCA_MODULE) | 139 | #ifdef CONFIG_IXGBE_DCA |
140 | /* cpu for tx queue */ | 140 | /* cpu for tx queue */ |
141 | int cpu; | 141 | int cpu; |
142 | #endif | 142 | #endif |