From 47e4c913ad435c0679181a7a8c38a80b656acf99 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Mon, 22 Apr 2013 19:42:16 +0000 Subject: [PATCH] --- yaml --- r: 369877 b: refs/heads/master c: cd4baaaa04b4aaa3b0ec4d13a6f3d203b92eadbd h: refs/heads/master i: 369875: 7bc8a135d43f03a5f17f6aaed887147f5334c786 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d82e5416afda..6634f1f8cb3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89cc80a44b7c320e08599cb86f6aef0ead8986a1 +refs/heads/master: cd4baaaa04b4aaa3b0ec4d13a6f3d203b92eadbd diff --git a/trunk/drivers/net/ethernet/freescale/gianfar_ptp.c b/trunk/drivers/net/ethernet/freescale/gianfar_ptp.c index 2e5daee0438a..a3f8a2551f2d 100644 --- a/trunk/drivers/net/ethernet/freescale/gianfar_ptp.c +++ b/trunk/drivers/net/ethernet/freescale/gianfar_ptp.c @@ -127,7 +127,6 @@ struct gianfar_ptp_registers { #define DRIVER "gianfar_ptp" #define DEFAULT_CKSEL 1 -#define N_ALARM 1 /* first alarm is used internally to reset fipers */ #define N_EXT_TS 2 #define REG_SIZE sizeof(struct gianfar_ptp_registers) @@ -410,7 +409,7 @@ static struct ptp_clock_info ptp_gianfar_caps = { .owner = THIS_MODULE, .name = "gianfar clock", .max_adj = 512000, - .n_alarm = N_ALARM, + .n_alarm = 0, .n_ext_ts = N_EXT_TS, .n_per_out = 0, .pps = 1,