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/usb/host/ehci-faraday.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/usb/host/ehci-faraday.c')
| -rw-r--r-- | drivers/usb/host/ehci-faraday.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c index b61b5382df4..85a35269601 100644 --- a/drivers/usb/host/ehci-faraday.c +++ b/drivers/usb/host/ehci-faraday.c @@ -16,8 +16,8 @@ #include "ehci.h" -#ifndef CONFIG_USB_EHCI_BASE_LIST -#define CONFIG_USB_EHCI_BASE_LIST { CONFIG_USB_EHCI_BASE } +#ifndef CFG_USB_EHCI_BASE_LIST +#define CFG_USB_EHCI_BASE_LIST { CONFIG_USB_EHCI_BASE } #endif union ehci_faraday_regs { @@ -93,7 +93,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr *hccr; struct ehci_hcor *hcor; union ehci_faraday_regs *regs; - uint32_t base_list[] = CONFIG_USB_EHCI_BASE_LIST; + uint32_t base_list[] = CFG_USB_EHCI_BASE_LIST; if (index < 0 || index >= ARRAY_SIZE(base_list)) return -1; |