From f26819f04eee225a9eb4439b89dd8d4d2c6523d1 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Thu, 1 Nov 2012 23:57:38 +0000 Subject: [PATCH] --- yaml --- r: 340641 b: refs/heads/master c: 70ac618c07b6ef959ff79a276b8d6c6626554dfd h: refs/heads/master i: 340639: 7ed4986491b19714e5bc6e95136c1f8217bae4e7 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/adi/Kconfig | 2 +- trunk/drivers/net/ethernet/ti/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b5634b72fcf1..dcad187be4ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56b765b79e9a78dc7d3f8850ba5e5567205a3ecd +refs/heads/master: 70ac618c07b6ef959ff79a276b8d6c6626554dfd diff --git a/trunk/drivers/net/ethernet/adi/Kconfig b/trunk/drivers/net/ethernet/adi/Kconfig index 175c38c077b2..e49c0eff040b 100644 --- a/trunk/drivers/net/ethernet/adi/Kconfig +++ b/trunk/drivers/net/ethernet/adi/Kconfig @@ -61,7 +61,7 @@ config BFIN_RX_DESC_NUM config BFIN_MAC_USE_HWSTAMP bool "Use IEEE 1588 hwstamp" - depends on BFIN_MAC && BF518 && PTP_1588_CLOCK && !(BFIN_MAC=y && PTP_1588_CLOCK=m) + select PTP_1588_CLOCK default y ---help--- To support the IEEE 1588 Precision Time Protocol (PTP), select y here diff --git a/trunk/drivers/net/ethernet/ti/Kconfig b/trunk/drivers/net/ethernet/ti/Kconfig index cbc3905a0a15..14297ff9c6dc 100644 --- a/trunk/drivers/net/ethernet/ti/Kconfig +++ b/trunk/drivers/net/ethernet/ti/Kconfig @@ -62,7 +62,7 @@ config TI_CPSW config TI_CPTS boolean "TI Common Platform Time Sync (CPTS) Support" - depends on TI_CPSW && PTP_1588_CLOCK && !(TI_CPSW=y && PTP_1588_CLOCK=m) + select PTP_1588_CLOCK ---help--- This driver supports the Common Platform Time Sync unit of the CPSW Ethernet Switch. The unit can time stamp PTP UDP/IPv4