diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-08-03 08:10:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-08-03 08:10:08 +0200 |
| commit | 3b5d1afd1f13bcab85eaa28223ad396694f929e3 (patch) | |
| tree | 02983e414b3d918114c15b8410ab46c245a07a29 /include/linux/fsl | |
| parent | f1ec5be17b9aafbc5f573da023850566b43d8e5e (diff) | |
| parent | 2ac82e20e2377fb0b63ce40bba56558f2df7cd3e (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/linux/fsl')
| -rw-r--r-- | include/linux/fsl/bestcomm/bestcomm.h | 2 | ||||
| -rw-r--r-- | include/linux/fsl/ptp_qoriq.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fsl/bestcomm/bestcomm.h b/include/linux/fsl/bestcomm/bestcomm.h index a0e2e6b19b57..154e541ce57e 100644 --- a/include/linux/fsl/bestcomm/bestcomm.h +++ b/include/linux/fsl/bestcomm/bestcomm.h @@ -27,7 +27,7 @@ */ struct bcom_bd { u32 status; - u32 data[0]; /* variable payload size */ + u32 data[]; /* variable payload size */ }; /* ======================================================================== */ diff --git a/include/linux/fsl/ptp_qoriq.h b/include/linux/fsl/ptp_qoriq.h index 75884563059f..884b8f8ca06d 100644 --- a/include/linux/fsl/ptp_qoriq.h +++ b/include/linux/fsl/ptp_qoriq.h @@ -135,7 +135,7 @@ struct ptp_qoriq_registers { #define DEFAULT_CKSEL 1 #define DEFAULT_TMR_PRSC 2 #define DEFAULT_FIPER1_PERIOD 1000000000 -#define DEFAULT_FIPER2_PERIOD 100000 +#define DEFAULT_FIPER2_PERIOD 1000000000 struct ptp_qoriq { void __iomem *base; |