summaryrefslogtreecommitdiffstats
path: root/arch/m68k/q40
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2016-09-05 13:18:15 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2016-09-19 11:29:45 +0200
commita1a9e88f708fc1c5602cbe9761f246c6acbc27cd (patch)
tree774f6b727141b4bd22e3ff97e778084b9d3911b5 /arch/m68k/q40
parentm68k/defconfig: Update defconfigs for v4.8-rc1 (diff)
downloadlinux-a1a9e88f708fc1c5602cbe9761f246c6acbc27cd.tar.xz
linux-a1a9e88f708fc1c5602cbe9761f246c6acbc27cd.zip
m68k: Use IS_ENABLED() instead of checking for built-in or module
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/q40')
-rw-r--r--arch/m68k/q40/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index fcb7f05b60b6..ea89a24f4600 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -180,7 +180,7 @@ void __init config_q40(void)
mach_reset = q40_reset;
mach_get_model = q40_get_model;
-#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
mach_beep = q40_mksound;
#endif
#ifdef CONFIG_HEARTBEAT