diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
| commit | 7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch) | |
| tree | cd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /arch/m68k/atari/config.c | |
| parent | 143c6fe3a415edf2dde3f507b3a00998b4c4001e (diff) | |
| parent | 20437f79f6627a31752f422688a6047c25cefcf1 (diff) | |
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'arch/m68k/atari/config.c')
| -rw-r--r-- | arch/m68k/atari/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 192b00f098f4..cbd5991fd49a 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -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)); |