diff --git a/[refs] b/[refs] index 060186a634ea..5f3873089684 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f77d602124d865c38705df7fa25c03de9c284ad2 +refs/heads/master: 3b76b3c37b89302db188b743f2f7b31aa666bb00 diff --git a/trunk/drivers/net/ethernet/calxeda/Kconfig b/trunk/drivers/net/ethernet/calxeda/Kconfig index aba435c3d4ae..184a063bed5f 100644 --- a/trunk/drivers/net/ethernet/calxeda/Kconfig +++ b/trunk/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