tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular

Fixes: 3ff228af84b5 ("atari_scsi: Convert to platform device")
Fixes: 0d31f8759109 ("sun3_scsi: Convert to platform device")
Reported-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

authored by

Finn Thain and committed by
Geert Uytterhoeven 2d522618 ea8d65ad

+3 -3
+2 -2
arch/m68k/atari/config.c
··· 858 858 }; 859 859 #endif /* CONFIG_ATARI_ETHERNEC */ 860 860 861 - #ifdef CONFIG_ATARI_SCSI 861 + #if IS_ENABLED(CONFIG_ATARI_SCSI) 862 862 static const struct resource atari_scsi_st_rsrc[] __initconst = { 863 863 { 864 864 .flags = IORESOURCE_IRQ, ··· 910 910 } 911 911 #endif 912 912 913 - #ifdef CONFIG_ATARI_SCSI 913 + #if IS_ENABLED(CONFIG_ATARI_SCSI) 914 914 if (ATARIHW_PRESENT(ST_SCSI)) 915 915 platform_device_register_simple("atari_scsi", -1, 916 916 atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc));
+1 -1
arch/m68k/sun3/config.c
··· 171 171 intersil_clear(); 172 172 } 173 173 174 - #ifdef CONFIG_SUN3_SCSI 174 + #if IS_ENABLED(CONFIG_SUN3_SCSI) 175 175 176 176 static const struct resource sun3_scsi_vme_rsrc[] __initconst = { 177 177 {