summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/vexpress-sysreg.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-01-25 18:53:52 +0000
committerOlof Johansson <olof@lixom.net>2013-01-28 14:07:14 -0800
commite065d3d417274bafed162b3dffd2e03a5128623c (patch)
tree04f2bccfd025065a03d45a815839a4a78a7a2c0c /drivers/mfd/vexpress-sysreg.c
parent3c2b251e88c0e7469be293afc240362bcc4c5b5a (diff)
downloadlinux-e065d3d417274bafed162b3dffd2e03a5128623c.tar.bz2
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>
Diffstat (limited to 'drivers/mfd/vexpress-sysreg.c')
-rw-r--r--drivers/mfd/vexpress-sysreg.c2
1 files changed, 1 insertions, 1 deletions
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;