From 5a84eb4f9e6c42e4fdbb2c7ead7cfc1662c3fe23 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 11 Sep 2011 23:30:45 +0200 Subject: [PATCH] --- yaml --- r: 294273 b: refs/heads/master c: c241a0e0c27882ecab1df57a44d202db6e02012c h: refs/heads/master i: 294271: 5676b3efe97067a5c9d35fce1402617e76a07946 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 5 +++-- trunk/arch/arm/mach-shmobile/board-mackerel.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 427a17b8fc8c..ce9502528e7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5ef967df13d4d243a2954c32bdd9181a1ee7382 +refs/heads/master: c241a0e0c27882ecab1df57a44d202db6e02012c diff --git a/trunk/arch/arm/mach-shmobile/board-ap4evb.c b/trunk/arch/arm/mach-shmobile/board-ap4evb.c index 714955e8b313..d4cc2dec5734 100644 --- a/trunk/arch/arm/mach-shmobile/board-ap4evb.c +++ b/trunk/arch/arm/mach-shmobile/board-ap4evb.c @@ -579,7 +579,8 @@ static const struct fb_videomode ap4evb_lcdc_modes[] = { #endif }, }; -static struct sh_mobile_meram_cfg lcd_meram_cfg = { + +static const struct sh_mobile_meram_cfg lcd_meram_cfg = { .icb[0] = { .meram_size = 0x40, }, @@ -856,7 +857,7 @@ static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq, return error; } -static struct sh_mobile_meram_cfg hdmi_meram_cfg = { +static const struct sh_mobile_meram_cfg hdmi_meram_cfg = { .icb[0] = { .meram_size = 0x100, }, diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c index a6ad4a4bd6f7..e761b280a602 100644 --- a/trunk/arch/arm/mach-shmobile/board-mackerel.c +++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c @@ -369,7 +369,7 @@ static int mackerel_get_brightness(void) return gpio_get_value(GPIO_PORT31); } -static struct sh_mobile_meram_cfg lcd_meram_cfg = { +static const struct sh_mobile_meram_cfg lcd_meram_cfg = { .icb[0] = { .meram_size = 0x40, }, @@ -455,7 +455,7 @@ static struct platform_device hdmi_device = { }, }; -static struct sh_mobile_meram_cfg hdmi_meram_cfg = { +static const struct sh_mobile_meram_cfg hdmi_meram_cfg = { .icb[0] = { .meram_size = 0x100, },