xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven
2016-09-05 13:18:15 +02:00
parent 986d804667
commit a1a9e88f70
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/amiga/config.c
View File

@@ -396,7 +396,7 @@ void __init config_amiga(void)
mach_max_dma_address = 0xffffffff; mach_max_dma_address = 0xffffffff;
mach_reset = amiga_reset; 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; mach_beep = amiga_mksound;
#endif #endif

2
arch/m68k/atari/config.c
View File

@@ -211,7 +211,7 @@ void __init config_atari(void)
arch_gettimeoffset = atari_gettimeoffset; arch_gettimeoffset = atari_gettimeoffset;
mach_reset = atari_reset; mach_reset = atari_reset;
mach_max_dma_address = 0xffffff; 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; mach_beep = atari_mksound;
#endif #endif
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT

2
arch/m68k/kernel/setup_mm.c
View File

@@ -105,7 +105,7 @@ EXPORT_SYMBOL(mach_heartbeat);
#ifdef CONFIG_M68K_L2_CACHE #ifdef CONFIG_M68K_L2_CACHE
void (*mach_l2_flush) (int); void (*mach_l2_flush) (int);
#endif #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); void (*mach_beep)(unsigned int, unsigned int);
EXPORT_SYMBOL(mach_beep); EXPORT_SYMBOL(mach_beep);
#endif #endif

2
arch/m68k/mac/config.c
View File

@@ -162,7 +162,7 @@ void __init config_mac(void)
mach_halt = mac_poweroff; mach_halt = mac_poweroff;
mach_power_off = mac_poweroff; mach_power_off = mac_poweroff;
mach_max_dma_address = 0xffffffff; 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; mach_beep = mac_mksound;
#endif #endif

2
arch/m68k/q40/config.c
View File

@@ -180,7 +180,7 @@ void __init config_q40(void)
mach_reset = q40_reset; mach_reset = q40_reset;
mach_get_model = q40_get_model; 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; mach_beep = q40_mksound;
#endif #endif
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT