diff options
Diffstat (limited to 'drivers/video/omap2/vram.c')
-rw-r--r-- | drivers/video/omap2/vram.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c index 55a4de5e5d10..3b1237ad85ed 100644 --- a/drivers/video/omap2/vram.c +++ b/drivers/video/omap2/vram.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
25 | #include <linux/list.h> | 25 | #include <linux/list.h> |
26 | #include <linux/slab.h> | ||
26 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
27 | #include <linux/bootmem.h> | 28 | #include <linux/bootmem.h> |
28 | #include <linux/completion.h> | 29 | #include <linux/completion.h> |
@@ -511,13 +512,14 @@ static u32 omap_vram_sdram_size __initdata; | |||
511 | static u32 omap_vram_def_sdram_size __initdata; | 512 | static u32 omap_vram_def_sdram_size __initdata; |
512 | static u32 omap_vram_def_sdram_start __initdata; | 513 | static u32 omap_vram_def_sdram_start __initdata; |
513 | 514 | ||
514 | static void __init omap_vram_early_vram(char **p) | 515 | static int __init omap_vram_early_vram(char *p) |
515 | { | 516 | { |
516 | omap_vram_def_sdram_size = memparse(*p, p); | 517 | omap_vram_def_sdram_size = memparse(p, &p); |
517 | if (**p == ',') | 518 | if (*p == ',') |
518 | omap_vram_def_sdram_start = simple_strtoul((*p) + 1, p, 16); | 519 | omap_vram_def_sdram_start = simple_strtoul(p + 1, &p, 16); |
520 | return 0; | ||
519 | } | 521 | } |
520 | __early_param("vram=", omap_vram_early_vram); | 522 | early_param("vram", omap_vram_early_vram); |
521 | 523 | ||
522 | /* | 524 | /* |
523 | * Called from map_io. We need to call to this early enough so that we | 525 | * Called from map_io. We need to call to this early enough so that we |