diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
| commit | d81344c50824a4d28a9397e97135d60075ac37ff (patch) | |
| tree | d25c443fb4a764cd788db857c49dd3d3f8f722d3 /drivers/net/ethernet/calxeda/Kconfig | |
| parent | 0de358f1c2642710d41190b73fbc295e675c4ab8 (diff) | |
| parent | 29bb9e5a75684106a37593ad75ec75ff8312731b (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in fixes before applying ongoing new work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/calxeda/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/calxeda/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig index aba435c3d4ae..184a063bed5f 100644 --- a/drivers/net/ethernet/calxeda/Kconfig +++ b/drivers/net/ethernet/calxeda/Kconfig @@ -1,6 +1,6 @@ config NET_CALXEDA_XGMAC tristate "Calxeda 1G/10G XGMAC Ethernet driver" - depends on HAS_IOMEM + depends on HAS_IOMEM && HAS_DMA select CRC32 help This is the driver for the XGMAC Ethernet IP block found on Calxeda |