Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d522618 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

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



Fixes: 3ff228af ("atari_scsi: Convert to platform device")
Fixes: 0d31f875 ("sun3_scsi: Convert to platform device")
Reported-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent ea8d65ad

arch/m68k/atari/config.c

+2 −2
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ static struct platform_device *atari_netusbee_devices[] __initdata = { 
};

#endif /* CONFIG_ATARI_ETHERNEC */



#ifdef CONFIG_ATARI_SCSI

#if IS_ENABLED(CONFIG_ATARI_SCSI)

static const struct resource atari_scsi_st_rsrc[] __initconst = {

	{

		.flags = IORESOURCE_IRQ,
@@ -910,7 +910,7 @@ int __init atari_platform_init(void) 
	}

#endif



#ifdef CONFIG_ATARI_SCSI

#if IS_ENABLED(CONFIG_ATARI_SCSI)

	if (ATARIHW_PRESENT(ST_SCSI))

		platform_device_register_simple("atari_scsi", -1,

			atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc));

arch/m68k/sun3/config.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void __init sun3_sched_init(irq_handler_t timer_routine) 
        intersil_clear();

}



#ifdef CONFIG_SUN3_SCSI

#if IS_ENABLED(CONFIG_SUN3_SCSI)



static const struct resource sun3_scsi_vme_rsrc[] __initconst = {

	{