m68k: Use IS_ENABLED() instead of checking for built-in or module

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index ec9cc1fdd237dec4e776aab29bb36816646a30a7..ddb8192a36618df426716a20c78a4b8186ca7680 100644 (file)
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -396,7 +396,7 @@ void __init config_amiga(void)
        mach_max_dma_address = 0xffffffff;
 
        mach_reset           = amiga_reset;
-#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
        mach_beep            = amiga_mksound;
 #endif
 

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index cbd5991fd49aa875fb189931d9afc27f720b0c71..97a3c38cd1f550ccf459b9c32c243a752f0e6cc0 100644 (file)
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -211,7 +211,7 @@ void __init config_atari(void)
        arch_gettimeoffset   = atari_gettimeoffset;
        mach_reset           = atari_reset;
        mach_max_dma_address = 0xffffff;
-#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
        mach_beep          = atari_mksound;
 #endif
 #ifdef CONFIG_HEARTBEAT

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 5b8ec4d5f8e8d79d1becaa48d489d0117374daa8..50633c38f1e2b0d6b943917325edb8810b93f260 100644 (file)
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -105,7 +105,7 @@ EXPORT_SYMBOL(mach_heartbeat);
 #ifdef CONFIG_M68K_L2_CACHE
 void (*mach_l2_flush) (int);
 #endif
-#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
 void (*mach_beep)(unsigned int, unsigned int);
 EXPORT_SYMBOL(mach_beep);
 #endif

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 2f33a33001e56a0ae048fc791d012db7d18d9b7c..e46895316eb0ef4df5b0c55ffa2492b66ce96699 100644 (file)
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -162,7 +162,7 @@ void __init config_mac(void)
        mach_halt = mac_poweroff;
        mach_power_off = mac_poweroff;
        mach_max_dma_address = 0xffffffff;
-#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
        mach_beep = mac_mksound;
 #endif
 

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index fcb7f05b60b60a7eb11d1222c8dac1cd93ac60dd..ea89a24f46000e4fb07d2192231eeab171a9c8b2 100644 (file)
--- 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