diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-05-20 18:39:02 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-05-20 18:39:02 (GMT) |
| commit | b08bbdbf93d9862b77d41560c1447f37c3954930 (patch) | |
| tree | 1defef32b478eead9fbcfc4646900a4122a86172 /drivers/net/ethernet/freescale | |
| parent | 84df6e416de47ccca8845e584ef3683ad068b790 (diff) | |
| parent | dbf932a9b316d5b29b3e220e5a30e7a165ad2992 (diff) | |
| download | linux-fsl-qoriq-b08bbdbf93d9862b77d41560c1447f37c3954930.tar.xz | |
Merge tag 'v3.8.13'
This is the 3.8.13 stable release
Diffstat (limited to 'drivers/net/ethernet/freescale')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ptp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c index 2e5daee..a3f8a25 100644 --- a/drivers/net/ethernet/freescale/gianfar_ptp.c +++ b/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, |