Merge tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

1af09ed5 · Linus Torvalds <[email protected]> · 2021-07-23 11:19:57 -07:00

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

Commit: 1af09ed5ae4d2d3bb3cc2e233f39f52be4147200
Parents: ec6badfb · 21ed4926

Merge commit. Changes below are compared with the first parent: ec6badfb.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/m68k/Kconfig.machine	modified	+1	−0	View file

arch/m68k/Kconfig.machine

View file

diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
index d964c1f..6a07a68 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