diff options
| author | David S. Miller | 2014-06-04 08:32:12 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-06-04 08:32:12 +0200 |
| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a /drivers/net/ethernet/Kconfig | |
| parent | net: remove some unless free on failure in alloc_netdev_mqs() (diff) | |
| parent | sh_eth: fix SH7619/771x support (diff) | |
| download | kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.gz kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.xz kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index f0e2a4d4f621..edb718661850 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -39,6 +39,7 @@ source "drivers/net/ethernet/cisco/Kconfig" config CX_ECAT tristate "Beckhoff CX5020 EtherCAT master support" depends on PCI + depends on X86 || COMPILE_TEST ---help--- Driver for EtherCAT master module located on CCAT FPGA that can be found on Beckhoff CX5020, and possibly other of CX |