diff --git a/[refs] b/[refs]
index 2a574608077d..64ba136558f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec8e8208acb88d81dde2727b0ac06d06728bf963
+refs/heads/master: edc9e3334a19efe1f0c1d2dc7df354e77c8d535d
diff --git a/trunk/arch/arm/mach-mv78xx0/addr-map.c b/trunk/arch/arm/mach-mv78xx0/addr-map.c
index a9bc84180d21..03f7486873e8 100644
--- a/trunk/arch/arm/mach-mv78xx0/addr-map.c
+++ b/trunk/arch/arm/mach-mv78xx0/addr-map.c
@@ -53,7 +53,7 @@ static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, i
 /*
  * Description of the windows needed by the platform code
  */
-static struct __initdata orion_addr_map_cfg addr_map_cfg = {
+static struct orion_addr_map_cfg addr_map_cfg __initdata = {
 	.num_wins = 14,
 	.remappable_wins = 8,
 	.win_cfg_base = win_cfg_base,