From d583d3de19acb20667f2355b5e2b54531eb6a62a Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 31 May 2004 18:50:23 -0700 Subject: [PATCH] [PATCH] vesafb: vram boot option the same as 2.4.x From: Marc-Christian Petersen Give the vesafb `vram' boot option the same (silly) syntax as 2.4 and document it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- Documentation/fb/vesafb.txt | 4 ++++ drivers/video/vesafb.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/fb/vesafb.txt b/Documentation/fb/vesafb.txt index 93514f5280a6c..36beb54f1a576 100644 --- a/Documentation/fb/vesafb.txt +++ b/Documentation/fb/vesafb.txt @@ -146,6 +146,10 @@ pmipal Use the protected mode interface for palette changes. mtrr setup memory type range registers for the vesafb framebuffer. +vram:n remap 'n' MiB of video RAM. If 0 or not specified, remap memory + according to video mode. (2.5.66 patch/idea by Antonino Daplas + reversed to give override possibility (allocate more fb memory + than the kernel would) to 2.4 by tmb@iki.fi) Have fun! diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 9b75ded90e72f..b8cb975083f06 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -207,7 +207,7 @@ int __init vesafb_setup(char *options) mtrr=1; else if (! strcmp(this_opt, "nomtrr")) mtrr=0; - else if (! strncmp(this_opt, "vram=", 5)) + else if (! strncmp(this_opt, "vram:", 5)) vram = simple_strtoul(this_opt+5, NULL, 0); } return 0; -- 2.53.0