Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2019-04-22 18:01:21 -07:00
+3 -3
View File
@@ -1622,9 +1622,9 @@ enum {
* See also commit cc019a5a3b58 ("scsi: scsi_transport_fc: fix typos on 64/128
* GBit define names") # v4.16.
*/
enum {
FC_PORTSPEED_64GBIT = 0x1000
};
#ifndef FC_PORTSPEED_64GBIT
#define FC_PORTSPEED_64GBIT 0x1000
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)