Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / watchdog / ibmasr.c

diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index db0a344..366b047 100644 (file)
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -360,7 +360,7 @@ struct ibmasr_id {
        int type;
 };
 
-static struct ibmasr_id __initdata ibmasr_id_table[] = {
+static struct ibmasr_id ibmasr_id_table[] __initdata = {
        { "IBM Automatic Server Restart - eserver xSeries 220", ASMTYPE_TOPAZ },
        { "IBM Automatic Server Restart - Machine Type 8673", ASMTYPE_PEARL },
        { "IBM Automatic Server Restart - Machine Type 8480", ASMTYPE_JASPER },