diff options
| author | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
| commit | 882ebfc28c389be86535bda4a7d9e407020356bf (patch) | |
| tree | e8f3ddeda13196f40040f3ba4701ece5d38c63cc /drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | |
| parent | mips/uapi: Add definition of TIOC[SG]RS485 (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.gz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.xz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.zip | |
Merge 3.17-rc5 into tty-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h index 3dbc047622fa..4535df37c227 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h @@ -25,8 +25,6 @@ #ifndef __STMMAC_PTP_H__ #define __STMMAC_PTP_H__ -#define STMMAC_SYSCLOCK 62500000 - /* IEEE 1588 PTP register offsets */ #define PTP_TCR 0x0700 /* Timestamp Control Reg */ #define PTP_SSIR 0x0704 /* Sub-Second Increment Reg */ |