aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/Kconfig
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2012-05-18 05:40:46 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-06-20 00:52:54 -0700
commit0e808bcc483773b4bcb45f02792b24ccfa428b68 (patch)
tree06f62c5fd8dacc1aef325ab74bc083b398557f76 /drivers/net/ethernet/intel/Kconfig
parentigb: Fix incorrect RAR address entries for i210/i211 device. (diff)
downloadlinux-dev-0e808bcc483773b4bcb45f02792b24ccfa428b68.tar.xz
linux-dev-0e808bcc483773b4bcb45f02792b24ccfa428b68.zip
Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support.
Fix Kconfig file to make sure that PTP and IGB/IXGBE are both either in-kernel or modules, not mixed. Having the build status mixed causes compile errors. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/Kconfig')
-rw-r--r--drivers/net/ethernet/intel/Kconfig10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 79b07ec6726f..0cafe4fe9406 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -122,8 +122,10 @@ config IGB_DCA
config IGB_PTP
bool "PTP Hardware Clock (PHC)"
- default y
- depends on IGB && PTP_1588_CLOCK
+ default n
+ depends on IGB && EXPERIMENTAL
+ select PPS
+ select PTP_1588_CLOCK
---help---
Say Y here if you want to use PTP Hardware Clock (PHC) in the
driver. Only the basic clock operations have been implemented.
@@ -223,7 +225,9 @@ config IXGBE_DCB
config IXGBE_PTP
bool "PTP Clock Support"
default n
- depends on IXGBE && PTP_1588_CLOCK
+ depends on IXGBE && EXPERIMENTAL
+ select PPS
+ select PTP_1588_CLOCK
---help---
Say Y here if you want support for 1588 Timestamping with a
PHC device, using the PTP 1588 Clock support. This is