summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Weber <weber@corscience.de>2010-03-03 09:16:54 +0100
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-03-10 13:15:45 +0200
commit5c1f96f4cffbdde9e194f3ae5373953f3fa12836 (patch)
tree9d6c9a552a067abf6d5a62e79fc68d0f052c899a
parent57d54889cd00db2752994b389ba714138652e60c (diff)
downloadop-kernel-dev-5c1f96f4cffbdde9e194f3ae5373953f3fa12836.zip
op-kernel-dev-5c1f96f4cffbdde9e194f3ae5373953f3fa12836.tar.gz
OMAP: DSS2: VRAM: Fix early_param for vram
In commit 2b0d8c251b8876d530a6bf671eb5425838fa698a the __early_param is replaced with the generic early_param. This patch fixes the parameter passing for the vram. Signed-off-by: Thomas Weber <weber@corscience.de> [tomi.valkeinen@nokia.com: changed the commit prefix] Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
-rw-r--r--drivers/video/omap2/vram.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 55a4de5..b266ffa 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -511,13 +511,14 @@ static u32 omap_vram_sdram_size __initdata;
static u32 omap_vram_def_sdram_size __initdata;
static u32 omap_vram_def_sdram_start __initdata;
-static void __init omap_vram_early_vram(char **p)
+static int __init omap_vram_early_vram(char *p)
{
- omap_vram_def_sdram_size = memparse(*p, p);
- if (**p == ',')
- omap_vram_def_sdram_start = simple_strtoul((*p) + 1, p, 16);
+ omap_vram_def_sdram_size = memparse(p, &p);
+ if (*p == ',')
+ omap_vram_def_sdram_start = simple_strtoul(p + 1, &p, 16);
+ return 0;
}
-__early_param("vram=", omap_vram_early_vram);
+early_param("vram", omap_vram_early_vram);
/*
* Called from map_io. We need to call to this early enough so that we
OpenPOWER on IntegriCloud