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/net/mvpp2.c | |
| 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/net/mvpp2.c')
| -rw-r--r-- | drivers/net/mvpp2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 8c9afdf79ab..1bad50d344c 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -66,8 +66,6 @@ do { \ #define NET_SKB_PAD max(32, MVPP2_CPU_D_CACHE_LINE_SIZE) -#define CONFIG_NR_CPUS 1 - /* 2(HW hdr) 14(MAC hdr) 4(CRC) 32(extra for cache prefetch) */ #define WRAP (2 + ETH_HLEN + 4 + 32) #define MTU 1500 @@ -589,7 +587,7 @@ enum mv_netc_lanes { /* Default number of RXQs in use */ #define MVPP2_DEFAULT_RXQ 1 -#define CONFIG_MV_ETH_RXQ 8 /* increment by 8 */ +#define CFG_MV_ETH_RXQ 8 /* increment by 8 */ /* Max number of Rx descriptors */ #define MVPP2_MAX_RXD 16 |