diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 17:59:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 17:59:24 -0700 |
| commit | 5419e783829127dba712be769bce8c6a1ec0057e (patch) | |
| tree | 2d0615419e48377baa126b58dc2f08ebfe68adb6 /arch/m68k/atari/config.c | |
| parent | 8e4ef6386703835f91898334b72e48649646ec00 (diff) | |
| parent | 6736e65effc3a5a866cf8a03cda9ad277b712d3f (diff) | |
Merge tag 'm68k-for-v4.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- cleanups
- defconfig updates
- GPG fingerprint update
* tag 'm68k-for-v4.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Migrate exception table users off module.h and onto extable.h
CREDITS: Update fingerprint for Geert Uytterhoeven
m68k: Use IS_ENABLED() instead of checking for built-in or module
m68k/defconfig: Update defconfigs for v4.8-rc1
Diffstat (limited to 'arch/m68k/atari/config.c')
| -rw-r--r-- | arch/m68k/atari/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index cbd5991fd49a..97a3c38cd1f5 100644 --- 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 |