summaryrefslogtreecommitdiffstats
path: root/arch/m68k/sun3
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 10:33:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 10:33:51 -0800
commit2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8 (patch)
tree97383c07c5ba1bf78ad50be4574e7f2fb26f9c15 /arch/m68k/sun3
parentc5c80bd923d34f7dc70e7b23eb427cd284989a1b (diff)
parenteb37bc3f85b69f529d2ad06c41fad8dedd654c76 (diff)
downloadlinux-2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Provide __phys_to_pfn() and __pfn_to_phys() m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular m68k/defconfig: Update defconfigs for v4.4-rc1 m68k/mac: Kill psc_present
Diffstat (limited to 'arch/m68k/sun3')
-rw-r--r--arch/m68k/sun3/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c
index 2a5f43a68ae3..71884bf01d72 100644
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -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 = {
{