diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-05 08:53:55 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-05 08:53:55 +0100 |
| commit | a02070f437d80c6f678e5ebe03fe2d9e2a3db642 (patch) | |
| tree | c09e170fd8a78e16807f36686c8f89f3775a1865 | |
| parent | 610d8769ed1a620c4a048c625b540a4d8ee14ffb (diff) | |
| parent | 5970d1426bb410f493da657e03c15fd5993c65d6 (diff) | |
| download | barebox-a02070f437d80c6f678e5ebe03fe2d9e2a3db642.tar.gz barebox-a02070f437d80c6f678e5ebe03fe2d9e2a3db642.tar.xz | |
Merge branch 'for-next/arm'
| -rw-r--r-- | arch/arm/crypto/sha1_glue.c | 2 | ||||
| -rw-r--r-- | arch/arm/crypto/sha256_glue.c | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/armlinux.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/crypto/sha1_glue.c b/arch/arm/crypto/sha1_glue.c index 57cd9d1014..cc032f6af2 100644 --- a/arch/arm/crypto/sha1_glue.c +++ b/arch/arm/crypto/sha1_glue.c @@ -135,4 +135,4 @@ static int sha1_mod_init(void) { return digest_algo_register(&m); } -device_initcall(sha1_mod_init); +coredevice_initcall(sha1_mod_init); diff --git a/arch/arm/crypto/sha256_glue.c b/arch/arm/crypto/sha256_glue.c index e649609a8e..d8a72a2cb9 100644 --- a/arch/arm/crypto/sha256_glue.c +++ b/arch/arm/crypto/sha256_glue.c @@ -189,7 +189,7 @@ static int sha224_digest_register(void) { return digest_algo_register(&sha224); } -device_initcall(sha224_digest_register); +coredevice_initcall(sha224_digest_register); static struct digest_algo sha256 = { .base = { @@ -212,4 +212,4 @@ static int sha256_digest_register(void) { return digest_algo_register(&sha256); } -device_initcall(sha256_digest_register); +coredevice_initcall(sha256_digest_register); diff --git a/arch/arm/include/asm/armlinux.h b/arch/arm/include/asm/armlinux.h index 5c39200a0c..135f11b860 100644 --- a/arch/arm/include/asm/armlinux.h +++ b/arch/arm/include/asm/armlinux.h @@ -5,7 +5,7 @@ #include <asm/setup.h> #include <asm/secure.h> -#if defined CONFIG_ARM_LINUX +#if defined CONFIG_ARM_LINUX && defined CONFIG_CPU_32 void armlinux_set_bootparams(void *params); void armlinux_set_architecture(int architecture); void armlinux_set_revision(unsigned int); |