Skip to content

Commit dcce854

Browse files
committed
m68k: coldfire: select PCI_IOMAP for PCI
After I dropped CONFIG_GENERIC_IOMAP, some PCI drivers started failing to link when CONFIG_MMU is disabled: ERROR: modpost: "pci_iounmap" [drivers/video/fbdev/i740fb.ko] undefined! ERROR: modpost: "pci_iounmap" [drivers/video/fbdev/vt8623fb.ko] undefined! ERROR: modpost: "pci_iomap_wc" [drivers/video/fbdev/vt8623fb.ko] undefined! ERROR: modpost: "pci_iomap" [drivers/video/fbdev/vt8623fb.ko] undefined! ERROR: modpost: "pci_iounmap" [drivers/video/fbdev/s3fb.ko] undefined! ... It turns out that there were two mistakes in my patch: on !MMU I forgot to enable CONFIG_GENERIC_PCI_IOMAP, and for Coldfire with MMU enabled, teh GENERIC_IOMAP was left in place but incorrectly configured. Fixes: 9d48cc0 ("m68k/nommu: stop using GENERIC_IOMAP") Reported-by: Greg Ungerer <gerg@linux-m68k.org> Acked-by: Greg Ungerer <gerg@linux-m68k.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent eb6a080 commit dcce854

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/m68k/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ config M68K
1818
select DMA_DIRECT_REMAP if M68K_NONCOHERENT_DMA && !COLDFIRE
1919
select GENERIC_ATOMIC64
2020
select GENERIC_CPU_DEVICES
21-
select GENERIC_IOMAP if HAS_IOPORT && MMU
21+
select GENERIC_IOMAP if HAS_IOPORT && MMU && !COLDFIRE
2222
select GENERIC_IRQ_SHOW
2323
select GENERIC_LIB_ASHLDI3
2424
select GENERIC_LIB_ASHRDI3
2525
select GENERIC_LIB_LSHRDI3
2626
select GENERIC_LIB_MULDI3
27+
select GENERIC_PCI_IOMAP if PCI
2728
select HAS_IOPORT if PCI || ISA || ATARI_ROM_ISA
2829
select HAVE_ARCH_LIBGCC_H
2930
select HAVE_ARCH_SECCOMP

0 commit comments

Comments
 (0)