diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
| commit | 83b21ed0fc2a7b17c6b9d4f72f664841f797380b (patch) | |
| tree | 99272c0f69b8d762bf82400e6bdb84146b5baadb /drivers/net/ethernet/intel/Kconfig | |
| parent | sysrq: Remove duplicated sysrq message (diff) | |
| parent | Linux 5.0-rc4 (diff) | |
| download | linux-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.tar.xz linux-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.zip | |
Merge 5.0-rc4 into tty-next
We need the tty and serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/intel/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/intel/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 31fb76ee9d82..a1246e89aad4 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig @@ -159,7 +159,7 @@ config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI select MDIO - select MDIO_DEVICE + select PHYLIB imply PTP_1588_CLOCK ---help--- This driver supports Intel(R) 10GbE PCI Express family of |