aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2008-04-28 05:15:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:39 -0400
commitc805df3d6205573fa7a8ef2334b1c8d67381dc8b (patch)
tree9cdf231771e48460fbacedb16f8ec8465850f742 /drivers/video
parentf694e53bd0db69557ee8e0db2d1602818ff173b0 (diff)
lxfb: rename kernel arg fbsize to vram
Match other fb drivers (including gxfb). Also, document the current boot arguments in Documentation/fb/lxfb.txt. Signed-off-by: Andres Salomon <dilinger@debian.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/geode/lxfb_core.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index b565882eee37..1da944bdb11a 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -27,7 +27,7 @@
27 27
28static char *mode_option; 28static char *mode_option;
29static int noclear, nopanel, nocrt; 29static int noclear, nopanel, nocrt;
30static int fbsize; 30static int vram;
31 31
32/* Most of these modes are sorted in ascending order, but 32/* Most of these modes are sorted in ascending order, but
33 * since the first entry in this table is the "default" mode, 33 * since the first entry in this table is the "default" mode,
@@ -339,7 +339,7 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
339 return ret; 339 return ret;
340 340
341 info->fix.smem_start = pci_resource_start(dev, 0); 341 info->fix.smem_start = pci_resource_start(dev, 0);
342 info->fix.smem_len = fbsize ? fbsize : lx_framebuffer_size(); 342 info->fix.smem_len = vram ? vram : lx_framebuffer_size();
343 343
344 info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len); 344 info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
345 345
@@ -608,9 +608,7 @@ static int __init lxfb_setup(char *options)
608 if (!*opt) 608 if (!*opt)
609 continue; 609 continue;
610 610
611 if (!strncmp(opt, "fbsize:", 7)) 611 if (!strcmp(opt, "noclear"))
612 fbsize = simple_strtoul(opt+7, NULL, 0);
613 else if (!strcmp(opt, "noclear"))
614 noclear = 1; 612 noclear = 1;
615 else if (!strcmp(opt, "nopanel")) 613 else if (!strcmp(opt, "nopanel"))
616 nopanel = 1; 614 nopanel = 1;
@@ -647,8 +645,8 @@ module_exit(lxfb_cleanup);
647module_param(mode_option, charp, 0); 645module_param(mode_option, charp, 0);
648MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])"); 646MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
649 647
650module_param(fbsize, int, 0); 648module_param(vram, int, 0);
651MODULE_PARM_DESC(fbsize, "video memory size"); 649MODULE_PARM_DESC(vram, "video memory size");
652 650
653MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX"); 651MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX");
654MODULE_LICENSE("GPL"); 652MODULE_LICENSE("GPL");