projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[cascardo/linux.git]
/
arch
/
m68k
/
sun3
/
config.c
diff --git
a/arch/m68k/sun3/config.c
b/arch/m68k/sun3/config.c
index
2a5f43a
..
71884bf
100644
(file)
--- 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();
}
-#if
def CONFIG_SUN3_SCSI
+#if
IS_ENABLED(CONFIG_SUN3_SCSI)
static const struct resource sun3_scsi_vme_rsrc[] __initconst = {
{