diff options
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
| -rw-r--r-- | drivers/video/nvidia/nvidia.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index f6d2440e84aa..dcf2e7a7d215 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
| @@ -485,7 +485,7 @@ static int nvidia_backlight_levels[] = { | |||
| 485 | 485 | ||
| 486 | static int nvidia_set_backlight_enable(int on, int level, void *data) | 486 | static int nvidia_set_backlight_enable(int on, int level, void *data) |
| 487 | { | 487 | { |
| 488 | struct nvidia_par *par = (struct nvidia_par *)data; | 488 | struct nvidia_par *par = data; |
| 489 | u32 tmp_pcrt, tmp_pmc, fpcontrol; | 489 | u32 tmp_pcrt, tmp_pmc, fpcontrol; |
| 490 | 490 | ||
| 491 | tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF; | 491 | tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF; |
| @@ -1515,7 +1515,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd, | |||
| 1515 | if (!info) | 1515 | if (!info) |
| 1516 | goto err_out; | 1516 | goto err_out; |
| 1517 | 1517 | ||
| 1518 | par = (struct nvidia_par *)info->par; | 1518 | par = info->par; |
| 1519 | par->pci_dev = pd; | 1519 | par->pci_dev = pd; |
| 1520 | 1520 | ||
| 1521 | info->pixmap.addr = kmalloc(8 * 1024, GFP_KERNEL); | 1521 | info->pixmap.addr = kmalloc(8 * 1024, GFP_KERNEL); |
| @@ -1811,6 +1811,9 @@ module_param(vram, int, 0); | |||
| 1811 | MODULE_PARM_DESC(vram, | 1811 | MODULE_PARM_DESC(vram, |
| 1812 | "amount of framebuffer memory to remap in MiB" | 1812 | "amount of framebuffer memory to remap in MiB" |
| 1813 | "(default=0 - remap entire memory)"); | 1813 | "(default=0 - remap entire memory)"); |
| 1814 | module_param(mode_option, charp, 0); | ||
| 1815 | MODULE_PARM_DESC(mode_option, "Specify initial video mode"); | ||
| 1816 | |||
| 1814 | #ifdef CONFIG_MTRR | 1817 | #ifdef CONFIG_MTRR |
| 1815 | module_param(nomtrr, bool, 0); | 1818 | module_param(nomtrr, bool, 0); |
| 1816 | MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) " | 1819 | MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) " |
