diff options
author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /drivers/crypto/fsl/jr.h | |
parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'drivers/crypto/fsl/jr.h')
-rw-r--r-- | drivers/crypto/fsl/jr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h index 3eb7be79da..4e4c4af580 100644 --- a/drivers/crypto/fsl/jr.h +++ b/drivers/crypto/fsl/jr.h @@ -15,7 +15,7 @@ #define JR_SIZE 4 /* Timeout currently defined as 10 sec */ -#define CONFIG_USEC_DEQ_TIMEOUT 10000000U +#define CFG_USEC_DEQ_TIMEOUT 10000000U #define DEFAULT_JR_ID 0 #define DEFAULT_JR_LIODN 0 |