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/musb-new/musb_core.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/musb-new/musb_core.c')
| -rw-r--r-- | drivers/usb/musb-new/musb_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index fc7af7484e..a42d98ece9 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -1525,8 +1525,8 @@ static int __devinit musb_core_init(u16 musb_type, struct musb *musb) /*-------------------------------------------------------------------------*/ -#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \ - defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) +#if defined(CONFIG_SOC_OMAP2430) || defined(CFG_SOC_OMAP3430) || \ + defined(CFG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) static irqreturn_t generic_interrupt(int irq, void *__hci) { |