diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-18 23:07:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-18 23:07:36 -0400 |
| commit | abf0061eabf43f43a3889871e259c9633e7a42e3 (patch) | |
| tree | fa0e4b2984c629092a61346dab9d69f91f7b078c /arch/m68k/include/asm/cache.h | |
| parent | df761ba4254eedf078840ecfade9644839cd5bc0 (diff) | |
| parent | b7b5cbe2794b2d3c8e9500c6de8257aa92cdae96 (diff) | |
Merge branch '2021-07-18-finalize-migrations'
- With the deadline for DM_USB (host controller support), DM_VIDEO,
DM_SPI_FLASH and DM_PCI now at 2 years past the release where their
migration deadline was given, finish removing platforms and enforcing
the switch.
Diffstat (limited to 'arch/m68k/include/asm/cache.h')
| -rw-r--r-- | arch/m68k/include/asm/cache.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h index fabec0ae92..ceb462f438 100644 --- a/arch/m68k/include/asm/cache.h +++ b/arch/m68k/include/asm/cache.h @@ -10,7 +10,7 @@ #define __CACHE_H #if defined(CONFIG_MCF520x) || defined(CONFIG_MCF523x) || \ - defined(CONFIG_MCF52x2) || defined(CONFIG_MCF5227x) + defined(CONFIG_MCF52x2) #define CONFIG_CF_V2 #endif @@ -19,9 +19,7 @@ #define CONFIG_CF_V3 #endif -#if defined(CONFIG_MCF5445x) -#define CONFIG_CF_V4 -#elif defined(CONFIG_MCF5441x) +#if defined(CONFIG_MCF5441x) #define CONFIG_CF_V4E /* Four Extra ACRn */ #endif |