From 2c4d3780064002230006c59a5a71f30ac1f10fe8 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Tue, 18 Dec 2012 03:06:44 +0000
Subject: [PATCH] --- yaml --- r: 347314 b: refs/heads/master c:
 c1e37ea287979052e3eab441e58da3899a8e2389 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/ethernet/freescale/Kconfig | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 454cb820fdd1..38cd82211a2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d23e946cb67e5011226bcbd1597a632ac7a48c35
+refs/heads/master: c1e37ea287979052e3eab441e58da3899a8e2389
diff --git a/trunk/drivers/net/ethernet/freescale/Kconfig b/trunk/drivers/net/ethernet/freescale/Kconfig
index 5ba6e1cbd346..ec490d741fc0 100644
--- a/trunk/drivers/net/ethernet/freescale/Kconfig
+++ b/trunk/drivers/net/ethernet/freescale/Kconfig
@@ -94,9 +94,8 @@ config GIANFAR
 
 config FEC_PTP
 	bool "PTP Hardware Clock (PHC)"
-	depends on FEC && ARCH_MXC
+	depends on FEC && ARCH_MXC && !SOC_IMX25 && !SOC_IMX27 && !SOC_IMX35 && !SOC_IMX5
 	select PTP_1588_CLOCK
-	default y if SOC_IMX6Q
 	--help---
 	  Say Y here if you want to use PTP Hardware Clock (PHC) in the
 	  driver.  Only the basic clock operations have been implemented.