diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-04 02:59:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-04 02:59:24 +0200 |
| commit | 5419e783829127dba712be769bce8c6a1ec0057e (patch) | |
| tree | 2d0615419e48377baa126b58dc2f08ebfe68adb6 /arch/m68k/kernel | |
| parent | Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | m68k: Migrate exception table users off module.h and onto extable.h (diff) | |
| download | linux-5419e783829127dba712be769bce8c6a1ec0057e.tar.xz linux-5419e783829127dba712be769bce8c6a1ec0057e.zip | |
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/kernel')
| -rw-r--r-- | arch/m68k/kernel/setup_mm.c | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/signal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 5b8ec4d5f8e8..50633c38f1e2 100644 --- 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/kernel/signal.c b/arch/m68k/kernel/signal.c index 9202f82dfce6..58507edbdf1d 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -42,7 +42,7 @@ #include <linux/personality.h> #include <linux/tty.h> #include <linux/binfmts.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/tracehook.h> #include <asm/setup.h> |