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

Commit 5419e783 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8e4ef638 6736e65e

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -3691,7 +3691,7 @@ S: Germany 
N: Geert Uytterhoeven

E: geert@linux-m68k.org

W: http://users.telenet.be/geertu/

P: 1024/862678A6 C51D 361C 0BD1 4C90 B275  C553 6EEA 11BA 8626 78A6

P: 4096R/4804B4BC3F55EEFB 750D 82B0 A781 5431 5E25  925B 4804 B4BC 3F55 EEFB

D: m68k/Amiga and PPC/CHRP Longtrail coordinator

D: Frame buffer device and XF68_FBDev maintainer

D: m68k IDE maintainer

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/configs/amiga_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m
@@ -584,6 +586,7 @@ CONFIG_CRYPTO_RMD160=m 
CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

arch/m68k/configs/apollo_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -525,6 +525,8 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_CRYPTD=m
@@ -543,6 +545,7 @@ CONFIG_CRYPTO_RMD160=m 
CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m