Commit 1af09ed5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ec6badfb 21ed4926

arch/m68k/Kconfig.machine

+1 −0
Original line number Diff line number Diff line
@@ -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