diff options
| author | Johan Hovold <johan@kernel.org> | 2014-09-15 16:07:37 (GMT) |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-09-15 16:10:34 (GMT) |
| commit | 4b7154ba70bb20a3c024faabdd2bc207b550a813 (patch) | |
| tree | 99a6e1204ec5deaca27bcbfc75ca16d3633433f2 /drivers/net/ethernet/apm/xgene | |
| parent | adceac14166da8c466223a35ec59c4a4adeef976 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| download | linux-4b7154ba70bb20a3c024faabdd2bc207b550a813.tar.xz | |
Merge tag 'v3.17-rc5' into usb-next
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/apm/xgene')
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig index 616dff6..f4054d24 100644 --- a/drivers/net/ethernet/apm/xgene/Kconfig +++ b/drivers/net/ethernet/apm/xgene/Kconfig @@ -1,5 +1,6 @@ config NET_XGENE tristate "APM X-Gene SoC Ethernet Driver" + depends on HAS_DMA select PHYLIB help This is the Ethernet driver for the on-chip ethernet interface on the |