diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/at91sam9263ek/Makefile | 4 | ||||
| -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 |
4 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/boards/at91sam9263ek/Makefile b/arch/arm/boards/at91sam9263ek/Makefile index 7af6fab8e1..66083a239e 100644 --- a/arch/arm/boards/at91sam9263ek/Makefile +++ b/arch/arm/boards/at91sam9263ek/Makefile @@ -1,4 +1,6 @@ -obj-$(CONFIG_AT91_BOOTSTRAP) += init.o +ifeq ($(CONFIG_OFDEVICE),) +obj-y += init.o +endif obj-$(CONFIG_OF_DEVICE) += of_init.o lwl-y += lowlevel_init.o 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); |