Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1a9e88f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 986d8046

arch/m68k/amiga/config.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/m68k/atari/config.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/m68k/kernel/setup_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/m68k/mac/config.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/m68k/q40/config.c

+1 −1
Original line number Diff line number Diff line
@@ -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