From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 25 Jan 2013 18:53:52 +0000 (+0000)
Subject: mfd/vexpress: vexpress_sysreg_setup must not be __init
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e065d3d417274bafed162b3dffd2e03a5128623c;p=linux-beck.git

mfd/vexpress: vexpress_sysreg_setup must not be __init

The patch 52666298a 'mfd: vexpress-sysreg: Don't skip initialization
on probe' adds a call to vexpress_sysreg_setup from a non-__init
function, so this also has to lose its __init annotation.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: arm@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index 77048b18439e..558c2928f261 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -313,7 +313,7 @@ static void vexpress_sysreg_config_complete(unsigned long data)
 }
 
 
-void __init vexpress_sysreg_setup(struct device_node *node)
+void vexpress_sysreg_setup(struct device_node *node)
 {
 	if (WARN_ON(!vexpress_sysreg_base))
 		return;