diff --git a/[refs] b/[refs] index 94d0f583a2fe..b4bd20a1f23d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5724c52fbef16f17af3b92c6cae4fda391beb84c +refs/heads/master: 721e0205b07589223343737a9c421d8118d87bba diff --git a/trunk/arch/arm/mach-bcm/bcm_kona_smc.c b/trunk/arch/arm/mach-bcm/bcm_kona_smc.c index 5f1d13175138..56d9d19b2470 100644 --- a/trunk/arch/arm/mach-bcm/bcm_kona_smc.c +++ b/trunk/arch/arm/mach-bcm/bcm_kona_smc.c @@ -41,7 +41,7 @@ static const struct of_device_id bcm_kona_smc_ids[] __initconst = { }; /* Map in the bounce area */ -void bcm_kona_smc_init(void) +void __init bcm_kona_smc_init(void) { struct device_node *node;