diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-29 15:48:12 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-06-29 15:48:12 +0100 |
| commit | fb2bbe6d40539e74fc890d529c370e6b977fbf47 (patch) | |
| tree | 41c5bbfcae5617b46bf32400fd17372bf30b3ec3 /drivers/net/ethernet/intel/Kconfig | |
| parent | 74da01dcfbb6300d758490d5d4efa1314c0e4e8b (diff) | |
| parent | 0a01063d5fd7417175512f0f916629008c0a842e (diff) | |
Merge branch 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6 into drm-core-nextdrm-radeon-testing
* 'drm-fixes' of /home/airlied/devel/kernel/linux-2.6: (186 commits)
drm/radeon: disable any GPU activity after unrecovered lockup v5
drm/radeon: fix VM page table setup on SI
watchdog: core: fix WDIOC_GETSTATUS return value
watchdog: hpwdt: Unregister NMI events on exit.
watchdog: iTCO_wdt: add platform driver module alias
udf: Fortify loading of sparing table
udf: Avoid run away loop when partition table length is corrupted
udf: Use 'ret' instead of abusing 'i' in udf_load_logicalvol()
sh: Convert sh_clk_mstp32_register to sh_clk_mstp_register
sh: kfr2r09: fix compile breakage
9p: fix min_t() casting in p9pdu_vwritef()
chmod +x scripts/gfp-translate
Revert "drm/i915: allow PCH PWM override on IVB"
UBI: correct usage of IS_ENABLED()
UBIFS: correct usage of IS_ENABLED()
can: flexcan: use be32_to_cpup to handle the value of dt entry
drm/nouveau: add license header to prime.
xen/netfront: teardown the device before unregistering it.
bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)
vhost: use USER_DS in vhost_worker thread
...
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'drivers/net/ethernet/intel/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/intel/Kconfig | 10 |
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 |