diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-15 16:42:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-15 16:42:06 -0400 |
| commit | 506159549df76034dfbdee562304ce4c102d3a06 (patch) | |
| tree | 85c116fc3267a1ce16d6771f0a08675788d48ccd /drivers/usb/host/ehci-marvell.c | |
| parent | 5f09f9af3cc335fe6a74c031cfa0b1d8bdf4b9db (diff) | |
| parent | 24bf6e84ce22cd1b53cb79e4f89a4036af7e9c6b (diff) | |
Merge branch '2020-05-15-misc-bugfixes'
- A number of symbol name consistency updates
- JFFS2 bugfix
- Use /* fallthrough */ for now to help at least gcc know when we're
intentionally not 'break;'ing in a switch statement, we'll adopt
fallthrough; later on.
- Assorted other fixes
Diffstat (limited to 'drivers/usb/host/ehci-marvell.c')
| -rw-r--r-- | drivers/usb/host/ehci-marvell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 8efe6b63b9..5a9bd549e3 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -13,9 +13,9 @@ #include <asm/arch/cpu.h> #include <dm.h> -#if defined(CONFIG_KIRKWOOD) +#if defined(CONFIG_ARCH_KIRKWOOD) #include <asm/arch/soc.h> -#elif defined(CONFIG_ORION5X) +#elif defined(CONFIG_ARCH_ORION5X) #include <asm/arch/orion5x.h> #endif |