Skip to content

Commit

Permalink
m68k/atari, m68k/sun3: Fix SCSI platform device registration when dri…
Browse files Browse the repository at this point in the history
…ver is modular

Fixes: 3ff228a ("atari_scsi: Convert to platform device")
Fixes: 0d31f87 ("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>
  • Loading branch information
Finn Thain authored and Geert Uytterhoeven committed Jan 10, 2016
1 parent ea8d65a commit 2d52261
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/m68k/atari/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/sun3/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
{
Expand Down

0 comments on commit 2d52261

Please sign in to comment.