diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-07 22:50:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-07 22:50:41 -0400 |
| commit | bfb5bfa3c58adc2ef5dbd1bb95b79b31e0dc221c (patch) | |
| tree | 21753c7f94144a286584c1f631ad9bde89a1a438 /arch/m68k/include/asm/coldfire/intctrl.h | |
| parent | 7e58a3a148fb94e9ce09fb48d0ddd75c20ee7df9 (diff) | |
| parent | 123dc510c6e79f0c94718e2e6b5e4074754aa629 (diff) | |
Merge branch '2021-07-07-remove-non-migrated-platforms'
- Remove a large number of platforms that did not migrate to DM_PCI or
DM_USB by 2 years past the migration deadline and do not have a
migration imminent.
Diffstat (limited to 'arch/m68k/include/asm/coldfire/intctrl.h')
| -rw-r--r-- | arch/m68k/include/asm/coldfire/intctrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h index 7b42e65bc82..f7f0f07d30f 100644 --- a/arch/m68k/include/asm/coldfire/intctrl.h +++ b/arch/m68k/include/asm/coldfire/intctrl.h @@ -11,7 +11,7 @@ #if defined(CONFIG_M5235) || defined(CONFIG_M5271) || \ defined(CONFIG_M5275) || defined(CONFIG_M5282) || \ - defined(CONFIG_M547x) || defined(CONFIG_M548x) + defined(CONFIG_M547x) # define CONFIG_SYS_CF_INTC_REG1 #endif |