diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-05 11:00:18 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-07 04:33:11 -0400 |
| commit | edc9e3334a19efe1f0c1d2dc7df354e77c8d535d (patch) | |
| tree | 265a27e5e513e1c4d4f74fe52f6d8d92440a1fbd | |
| parent | ec8e8208acb88d81dde2727b0ac06d06728bf963 (diff) | |
ARM: mv78xx0: correct addr_map_cfg __initdata annotation
The annotation on the addr_map_cfg variable is in the wrong place.
Without this patch, building mv78xx0_defconfig results in:
/home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: initialization from incompatible pointer type [enabled by default]
/home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: (near initialization for 'addr_map_cfg.win_cfg_base') [enabled by default]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Cc: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/mach-mv78xx0/addr-map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c index a9bc84180d21..03f7486873e8 100644 --- a/arch/arm/mach-mv78xx0/addr-map.c +++ b/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 | |||
| 53 | /* | 53 | /* |
| 54 | * Description of the windows needed by the platform code | 54 | * Description of the windows needed by the platform code |
| 55 | */ | 55 | */ |
| 56 | static struct __initdata orion_addr_map_cfg addr_map_cfg = { | 56 | static struct orion_addr_map_cfg addr_map_cfg __initdata = { |
| 57 | .num_wins = 14, | 57 | .num_wins = 14, |
| 58 | .remappable_wins = 8, | 58 | .remappable_wins = 8, |
| 59 | .win_cfg_base = win_cfg_base, | 59 | .win_cfg_base = win_cfg_base, |