diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-23 11:19:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-23 11:19:57 -0700 |
| commit | 1af09ed5ae4d2d3bb3cc2e233f39f52be4147200 (patch) | |
| tree | 6a0939f120f0bdcafde3d6ab38ea7634a6ee552a /arch | |
| parent | ec6badfbe1cde0eb2bec4a0b8f6e738171156b5b (diff) | |
| parent | 21ed49265986931b8921a2404394426870245bd2 (diff) | |
Merge tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fix from Geert Uytterhoeven:
- Fix a Mac defconfig regression due to the IDE -> ATA switch
* tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: MAC should select HAVE_PATA_PLATFORM
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/Kconfig.machine | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index d964c1f27399..6a07a6817885 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -33,6 +33,7 @@ config MAC depends on MMU select MMU_MOTOROLA if MMU select HAVE_ARCH_NVRAM_OPS + select HAVE_PATA_PLATFORM select LEGACY_TIMER_TICK help This option enables support for the Apple Macintosh series of |