|
@@ -101,7 +101,7 @@ static const struct svga_timing_regs ark_timing_regs = {
|
|
|
|
|
|
/* Module parameters */
|
|
/* Module parameters */
|
|
|
|
|
|
-static char *mode = "640x480-8@60";
|
|
|
|
|
|
+static char *mode_option __devinitdata = "640x480-8@60";
|
|
|
|
|
|
#ifdef CONFIG_MTRR
|
|
#ifdef CONFIG_MTRR
|
|
static int mtrr = 1;
|
|
static int mtrr = 1;
|
|
@@ -111,8 +111,10 @@ MODULE_AUTHOR("(c) 2007 Ondrej Zajicek <santiago@crfreenet.org>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("fbdev driver for ARK 2000PV");
|
|
MODULE_DESCRIPTION("fbdev driver for ARK 2000PV");
|
|
|
|
|
|
-module_param(mode, charp, 0444);
|
|
|
|
-MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
|
|
|
|
|
|
+module_param(mode_option, charp, 0444);
|
|
|
|
+MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
|
|
|
|
+module_param_named(mode, mode_option, charp, 0444);
|
|
|
|
+MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc) (deprecated)");
|
|
|
|
|
|
#ifdef CONFIG_MTRR
|
|
#ifdef CONFIG_MTRR
|
|
module_param(mtrr, int, 0444);
|
|
module_param(mtrr, int, 0444);
|
|
@@ -999,10 +1001,10 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
|
|
info->pseudo_palette = (void*) (par->pseudo_palette);
|
|
info->pseudo_palette = (void*) (par->pseudo_palette);
|
|
|
|
|
|
/* Prepare startup mode */
|
|
/* Prepare startup mode */
|
|
- rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8);
|
|
|
|
|
|
+ rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
|
|
if (! ((rc == 1) || (rc == 2))) {
|
|
if (! ((rc == 1) || (rc == 2))) {
|
|
rc = -EINVAL;
|
|
rc = -EINVAL;
|
|
- dev_err(&(dev->dev), "mode %s not found\n", mode);
|
|
|
|
|
|
+ dev_err(&(dev->dev), "mode %s not found\n", mode_option);
|
|
goto err_find_mode;
|
|
goto err_find_mode;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1190,7 +1192,7 @@ static int __init arkfb_init(void)
|
|
return -ENODEV;
|
|
return -ENODEV;
|
|
|
|
|
|
if (option && *option)
|
|
if (option && *option)
|
|
- mode = option;
|
|
|
|
|
|
+ mode_option = option;
|
|
#endif
|
|
#endif
|
|
|
|
|
|
pr_debug("arkfb: initializing\n");
|
|
pr_debug("arkfb: initializing\n");
|