diff --git a/[refs] b/[refs] index 11a3f5f39fc2..1d46f2dc16fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c2b251e88c0e7469be293afc240362bcc4c5b5a +refs/heads/master: e065d3d417274bafed162b3dffd2e03a5128623c diff --git a/trunk/drivers/mfd/vexpress-sysreg.c b/trunk/drivers/mfd/vexpress-sysreg.c index 77048b18439e..558c2928f261 100644 --- a/trunk/drivers/mfd/vexpress-sysreg.c +++ b/trunk/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;