diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2016-09-05 13:18:15 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2016-09-19 11:29:45 +0200 |
| commit | a1a9e88f708fc1c5602cbe9761f246c6acbc27cd (patch) | |
| tree | 774f6b727141b4bd22e3ff97e778084b9d3911b5 /arch/m68k/mac | |
| parent | m68k/defconfig: Update defconfigs for v4.8-rc1 (diff) | |
| download | linux-dev-a1a9e88f708fc1c5602cbe9761f246c6acbc27cd.tar.xz linux-dev-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/mac')
| -rw-r--r-- | arch/m68k/mac/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 2f33a33001e5..e46895316eb0 100644 --- 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 |