Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / cavium / Kconfig

diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index 4875cda..1c76c95 100644 (file)
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -66,7 +66,7 @@ config LIQUIDIO
        tristate "Cavium LiquidIO support"
        depends on 64BIT && PCI
        depends on PCI
-       imply PTP_1588_CLOCK
+       depends on PTP_1588_CLOCK_OPTIONAL
        select FW_LOADER
        select LIBCRC32C
        select NET_DEVLINK
@@ -91,7 +91,7 @@ config OCTEON_MGMT_ETHERNET
 config LIQUIDIO_VF
        tristate "Cavium LiquidIO VF support"
        depends on 64BIT && PCI_MSI
-       imply PTP_1588_CLOCK
+       depends on PTP_1588_CLOCK_OPTIONAL
        help
          This driver supports Cavium LiquidIO Intelligent Server Adapter
          based on CN23XX chips.